summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-07-19 19:24:22 +0000
committerJeremy Katz <katzj@redhat.com>2006-07-19 19:24:22 +0000
commit2cf9e9c5ea46cac0a99fddf70b48f653c27f327d (patch)
treeac7df84c72e3ed5a90e8ae98940ade5a4f9ff35e /scripts
parent09b8426e64b3ee91a433bd0d5e3592ddaf4928ff (diff)
downloadanaconda-2cf9e9c5ea46cac0a99fddf70b48f653c27f327d.tar.gz
anaconda-2cf9e9c5ea46cac0a99fddf70b48f653c27f327d.tar.xz
anaconda-2cf9e9c5ea46cac0a99fddf70b48f653c27f327d.zip
2006-07-19 Jeremy Katz <katzj@redhat.com>
* scripts/scrubtree: Fix for new busybox so that we get links to all of the busybox applets (#199463) * scripts/mk-images: Likewise
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mk-images2
-rwxr-xr-xscripts/scrubtree2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index f50143650..7f6331ffb 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -445,7 +445,7 @@ EOF
# make some symlinks
ln -sf bash $MBD_DIR/sbin/sh
(cd $MBD_DIR/sbin;
- set $(./busybox 2>&1| awk '/^\t([[:alnum:]_\[]+,)+/' | sed 's/,//g' | sed 's/ +//');
+ 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
diff --git a/scripts/scrubtree b/scripts/scrubtree
index af6800d0b..7c43d1541 100755
--- a/scripts/scrubtree
+++ b/scripts/scrubtree
@@ -47,7 +47,7 @@ rm $p/etc/ld.so.conf
#
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/ +//');
+set $(./busybox 2>&1| awk '/^\t([[:alnum:]_\.\[]+,)+/' | sed 's/,//g' | sed 's/ +//');
dontclobber=(sh busybox reboot shutdown poweroff)
while [ -n "$1" ]; do
save=