summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xscripts/scrubtree2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ac4a66db..97edacd19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-03 Jeremy Katz <katzj@redhat.com>
+
+ * scripts/scrubtree: Don't use busybox shutdown, poweroff, or
+ reboot (#137948)
+
2004-11-03 Karsten Hopp <karsten@redhat.com>
* loader2/linuxrc.s390: Check input for CTCPROT, remove ctc-tty
diff --git a/scripts/scrubtree b/scripts/scrubtree
index 5c5be9466..4b87c0d60 100755
--- a/scripts/scrubtree
+++ b/scripts/scrubtree
@@ -50,7 +50,7 @@ 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/ +//');
while [ -n "$1" ]; do
- if [ $1 != "busybox" -a $1 != "sh" ]; then
+ if [ $1 != "busybox" -a $1 != "sh" -a $1 != "shutdown" -a $1 != "poweroff" -a $1 != "reboot" ]; then
# if file doesnt already exist, link to busybox
if [ ! -f "$1" ]; then
ln -sf ./busybox $1