[rhel5-branch] Use static busybox, not busybox-anaconda (#500527)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 scripts/scrubtree    |    2 +-
 scripts/upd-instroot |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/scrubtree b/scripts/scrubtree
index 6b604b0..6866937 100755
--- a/scripts/scrubtree
+++ b/scripts/scrubtree
@@ -45,7 +45,7 @@ rm $p/etc/ld.so.conf
 #
 # HOWEVER dont clobber existing programs supplied by other packages if exist
 #
-mv $p/usr/sbin/busybox.anaconda $p/usr/bin/busybox
+mv $p/usr/sbin/busybox $p/usr/bin/busybox
 (cd $p/usr/bin;
 set $(./busybox 2>&1| awk '/^\t([[:alnum:]_\.\[]+,)+/' | sed 's/,//g' | sed 's/ +//');
 dontclobber=(sh busybox reboot shutdown poweroff)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 6541ec0..37e13fd 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -110,7 +110,7 @@ PACKAGES="glibc glibc-common setup openssl python python-libs newt slang libseli
 	 procps rpm rpm-libs XFree86 Xconfigurator anaconda tzdata
 	 anaconda-runtime kudzu hwdata bzip2 beecrypt mdadm libsemanage
 	 bzip2-libs dosfstools pciutils reiserfs-utils parted sed
-	 busybox-anaconda rpm-python booty hdparm lvm2 beecrypt device-mapper
+	 busybox rpm-python booty hdparm lvm2 beecrypt device-mapper
 	 rhpl pyxf86config libxml2 libxml2-python glib2 sqlite neon
 	 elfutils-libelf krb5-libs convertdb1 jfsutils audit-libs pam
 	 xfsprogs xfsdump dmapi libacl libattr attr acl python-urlgrabber
@@ -335,7 +335,7 @@ sbin/kpartx.static
 sbin/mpath_prio_*.static
 lib/udev/scsi_id
 sbin/badblocks
-sbin/busybox.anaconda
+sbin/busybox
 sbin/clock
 sbin/cryptsetup
 sbin/debugfs
@@ -551,7 +551,7 @@ usr/sbin/in.telnetd
 usr/sbin/xinetd
 sbin/cmsfslst
 sbin/cmsfscat
-sbin/busybox.anaconda
+sbin/busybox
 sbin/ifconfig
 sbin/route
 sbin/portmap
-- 
1.7.3.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux