---
scripts/mk-images | 16 ----------------
scripts/scrubtree | 26 --------------------------
scripts/upd-instroot | 5 +----
3 files changed, 1 insertions(+), 46 deletions(-)
diff --git a/scripts/mk-images b/scripts/mk-images
index da8796b..2643221 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -468,22 +468,6 @@ EOF
# copy in the binaries
instbin $IMGPATH /usr/bin/login $MBD_DIR /sbin/login
instbin $IMGPATH /usr/sbin/sshd $MBD_DIR /sbin/sshd
- instbin $IMGPATH /usr/bin/busybox $MBD_DIR /sbin/busybox
-
- # make some symlinks
- (cd $MBD_DIR/sbin;
- set $(./busybox 2>&1| awk '/^\t([[:alnum:]_\.\[]+,)+/' | sed 's/,//g' | sed 's/ +//');
- while [ -n "$1" ]; do
- if [ $1 != "busybox" -a $1 != "sh" ]; then
- # if file doesnt already exist, link to busybox
- if [ ! -f "$1" ]; then
- ln -sf ./busybox $1
- else
- [ -n "$DEBUG" ] && echo "Overriding busybox version of $1"
- fi
- fi
- shift
- done )
}
diff --git a/scripts/scrubtree b/scripts/scrubtree
index adaa18b..26c67f3 100755
--- a/scripts/scrubtree
+++ b/scripts/scrubtree
@@ -53,30 +53,4 @@ if [ $ARCH != s390 -a $ARCH != s390x ]; then
fi
rm $p/etc/ld.so.conf
-#
-# make sure we have links for programs supplied by busybox
-#
-# HOWEVER dont clobber existing programs supplied by other packages if exist
-#
-mv $p/usr/sbin/busybox.anaconda $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)
-while [ -n "$1" ]; do
- save=
- for n in ${dontclobber[@]} ; do
- if [ "$1" == "$n" ]; then
- save=$n
- fi
- done
- # if it's not in our list and it doesn't exist, link to busybox
- if [ -z "$save" -a ! -f "$1" -a ! -f "$p/usr/sbin/$1" ]; then
- ln -sf ./busybox $1
- else
- [ -n "$DEBUG" ] && echo "Overriding busybox version of $1"
- fi
- shift
-done
-)
-
umount $p/proc
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 8a6ddca..235f579 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -152,7 +152,7 @@ die () {
PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit acl anaconda
anaconda-yum-plugins at-spi atk attr audit-libs bash bitmap-fonts-cjk
- btrfs-progs busybox-anaconda bzip2 bzip2-libs cairo cjkuni-uming-fonts
+ btrfs-progs bzip2 bzip2-libs cairo cjkuni-uming-fonts
comps-extras coreutils cpio cracklib cracklib-dicts cracklib-python
cryptsetup-luks db4 dbus dbus-python dejavu-sans-fonts
dejavu-sans-mono-fonts device-mapper
@@ -353,7 +353,6 @@ sbin/arping
sbin/badblocks
sbin/btrfsctl
sbin/btrfsck
-sbin/busybox.anaconda
sbin/clock
sbin/consoletype
sbin/cryptsetup
@@ -966,8 +965,6 @@ find $DEST -type d | xargs chmod 755
if [ -f $DEST/bin/bash ]; then
rm -f $DEST/bin/ash
ln -s bash $DEST/bin/sh
-else
- ln -sf busybox $DEST/bin/sh
fi
[ -d $DEST/bin ] || die "ERROR: directory missing: $DEST/bin"
--
1.6.1.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
