# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1267446934 -3600
# Node ID 94d647af395f60a9c8c48e2d3d8f568d55154299
# Parent  b72826dd8ec28e57049c3fc8b440ec79139f9692
busybox: may not overload gnu utilities

diff -r b72826dd8ec2 -r 94d647af395f busybox-pam/receipt
--- a/busybox-pam/receipt	Mon Mar 01 13:28:15 2010 +0100
+++ b/busybox-pam/receipt	Mon Mar 01 13:35:34 2010 +0100
@@ -94,13 +94,32 @@
 # Force glibc-2.7 reinstall if 2.3.6 still in use.
 pre_install()
 {
+	local i
 	cp -a /etc/resolv.conf /etc/resolv.conf-busybox-install
 	if grep -q 'VERSION="2.3.6"' /var/lib/tazpkg/installed/glibc-base/receipt; then
 		tazpkg get-install glibc-base --forced
 	fi
+	answer=""
+	while read i ; do
+		[ -e $ROOT$i ] || continue
+		if [ -z "$answer" ]; then
+			echo -n "Keep installed GNU utilities ? "
+			read answer
+			case "$answer" in
+			y*|Y*|o*|O*);;
+			*) break;;
+			esac
+		fi
+		mv $ROOT$i $ROOT$i-busybox-install
+	done < $1$INSTALLED/$PACKAGE/files.list
 }
 
 post_install()
 {
+	local i
 	mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf
+	while read i ; do
+		[ -e $ROOT$i-busybox-install ] || continue
+		mv $ROOT$i-busybox-install $ROOT$i
+	done < $1$INSTALLED/$PACKAGE/files.list
 }
diff -r b72826dd8ec2 -r 94d647af395f busybox/receipt
--- a/busybox/receipt	Mon Mar 01 13:28:15 2010 +0100
+++ b/busybox/receipt	Mon Mar 01 13:35:34 2010 +0100
@@ -82,13 +82,32 @@
 # Force glibc-2.7 reinstall if 2.3.6 still in use.
 pre_install()
 {
+	local i
 	cp -a /etc/resolv.conf /etc/resolv.conf-busybox-install
 	if grep -q 'VERSION="2.3.6"' /var/lib/tazpkg/installed/glibc-base/receipt; then
 		tazpkg get-install glibc-base --forced
 	fi
+	answer=""
+	while read i ; do
+		[ -e $ROOT$i ] || continue
+		if [ -z "$answer" ]; then
+			echo -n "Keep installed GNU utilities ? "
+			read answer
+			case "$answer" in
+			y*|Y*|o*|O*);;
+			*) break;;
+			esac
+		fi
+		mv $ROOT$i $ROOT$i-busybox-install
+	done < $1$INSTALLED/$PACKAGE/files.list
 }
 
 post_install()
 {
+	local i
 	mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf
+	while read i ; do
+		[ -e $ROOT$i-busybox-install ] || continue
+		mv $ROOT$i-busybox-install $ROOT$i
+	done < $1$INSTALLED/$PACKAGE/files.list
 }