# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1278082864 -7200
# Node ID 4420ba71beb43294a5ea000c39accf95bc75210a
# Parent  609498d2778d37bc970d100fed6e014b7e047ace
busybox: ensure mod is 4755 (again)

diff -r 609498d2778d -r 4420ba71beb4 busybox-pam/receipt
--- a/busybox-pam/receipt	Fri Jul 02 12:30:41 2010 +0200
+++ b/busybox-pam/receipt	Fri Jul 02 17:01:04 2010 +0200
@@ -49,7 +49,6 @@
 genpkg_rules()
 {
     cp -a $src/_install/* $fs
-    chmod 4755 $fs/bin/busybox
     rm -f $fs/sbin/depmod $fs/usr/bin/ar
     cp -a stuff/etc $fs
     mkdir -p $fs/etc/init.d
@@ -98,7 +97,7 @@
 	fi
 	answer=""
 	while read i ; do
-		[ -e $ROOT$i ] || continue
+		[ -e $1$i ] || continue
 		if [ -z "$answer" ]; then
 			echo -n "Keep installed GNU utilities ? "
 			read answer
@@ -107,7 +106,7 @@
 			*) break;;
 			esac
 		fi
-		mv $ROOT$i $ROOT$i-busybox-install
+		mv $1$i $1$i-busybox-install
 	done < $1$INSTALLED/$PACKAGE/files.list
 }
 
@@ -116,7 +115,8 @@
 	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
+		[ -e $1$i-busybox-install ] || continue
+		mv $1$i-busybox-install $1$i
 	done < $1$INSTALLED/$PACKAGE/files.list
+	chmod 4755 $1/bin/busybox
 }
diff -r 609498d2778d -r 4420ba71beb4 busybox/receipt
--- a/busybox/receipt	Fri Jul 02 12:30:41 2010 +0200
+++ b/busybox/receipt	Fri Jul 02 17:01:04 2010 +0200
@@ -51,7 +51,6 @@
 genpkg_rules()
 {
     cp -a $src/_install/* $fs
-    chmod 4755 $fs/bin/busybox
     rm -f $fs/sbin/depmod $fs/usr/bin/ar
     mkdir -p $fs/etc/init.d
     # Busybox config files.
@@ -91,7 +90,7 @@
 	fi
 	answer=""
 	while read i ; do
-		[ -e $ROOT$i ] || continue
+		[ -e $1$i ] || continue
 		if [ -z "$answer" ]; then
 			echo -n "Keep installed GNU utilities ? "
 			read -t 30 answer	# by default: keep
@@ -100,7 +99,7 @@
 			*) ;;
 			esac
 		fi
-		mv $ROOT$i $ROOT$i-busybox-install
+		mv $1$i $1$i-busybox-install
 	done < $1$INSTALLED/$PACKAGE/files.list
 }
 
@@ -109,7 +108,8 @@
 	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
+		[ -e $1$i-busybox-install ] || continue
+		mv $1$i-busybox-install $1$i
 	done < $1$INSTALLED/$PACKAGE/files.list
+	chmod 4755 $1/bin/busybox
 }