From 2123c9700676c50ad7a296dd7ece17b8d994d464 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 28 Jun 2001 21:25:26 +0000
Subject: switch things to collage

---
 scripts/scrubtree    | 9 +++++++++
 scripts/upd-instroot | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/scrubtree b/scripts/scrubtree
index 1f0617ff3..96e7eda7b 100755
--- a/scripts/scrubtree
+++ b/scripts/scrubtree
@@ -24,6 +24,15 @@ mount -t proc proc $p/proc
 rm -f $p/usr/sbin/ldconfig $p/etc/ld.so.conf
 
 (cd $p/usr/bin; ./collage | $p/usr/lib/anaconda-runtime/mkcollagelinks ./collage)
+
+(cd $p/usr/bin;
+set $(mv busybox.anaconda busybox; ./busybox  2>&1| awk '/^\t([a-z\[]+,)+/' | sed 's/,//g' | sed 's/ +//');
+while [ -n "$1" ]; do
+    ln -sf ./busybox $1
+    shift
+done
+)
+
 umount $p/proc
 
 for l in `find $p -type f -perm +100 | grep -v "usr/X11R6/lib/modules" | xargs file | sed -n 's/^\([^:]*\):.*ELF.*$/\1/p'`; do
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 573ea162f..88b29454e 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -94,7 +94,8 @@ mkdir -p $DESTGR
 PACKAGES="glibc glibc-common setup openssl python newt libtermcap zlib
 	 ash kon2 e2fsprogs util-linux raidtools popt mount procps rpm
 	 XFree86 Xconfigurator anaconda anaconda-runtime kudzu-devel
-	 kudzu db3 rpm-python bzip2 bzip2-libs osfstools pciutils reiserfs-utils parted"
+	 kudzu db3 rpm-python bzip2 bzip2-libs osfstools pciutils 
+	 reiserfs-utils parted busybox-anaconda"
 
 if [ $ARCH = i386 ]; then
     PACKAGES="$PACKAGES kernel-pcmcia-cs"
@@ -194,6 +195,7 @@ sbin/hwclock
 sbin/ldconfig
 sbin/mkdosfs
 sbin/mke2fs
+sbin/busybox.anaconda
 sbin/mkfs.ext2
 sbin/mkfs.msdos
 sbin/mkreiserfs
-- 
cgit