diff options
| author | Florian La Roche <laroche@redhat.com> | 2002-06-26 09:08:11 +0000 |
|---|---|---|
| committer | Florian La Roche <laroche@redhat.com> | 2002-06-26 09:08:11 +0000 |
| commit | 39aa2c790f150cfc31fd59028c9cc397a7b9c8c9 (patch) | |
| tree | 5c0c32c4a2b61cc24ec8392cf29d67a74376e913 | |
| parent | b1c3fe8675bf6d6831b2d63adb42dc43ef96f69e (diff) | |
| download | initscripts-39aa2c790f150cfc31fd59028c9cc397a7b9c8c9.tar initscripts-39aa2c790f150cfc31fd59028c9cc397a7b9c8c9.tar.gz initscripts-39aa2c790f150cfc31fd59028c9cc397a7b9c8c9.tar.bz2 initscripts-39aa2c790f150cfc31fd59028c9cc397a7b9c8c9.tar.xz initscripts-39aa2c790f150cfc31fd59028c9cc397a7b9c8c9.zip | |
- move HALTARGS down some more
| -rwxr-xr-x | rc.d/init.d/halt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index 82ffe34e..ac25bb6f 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -190,11 +190,6 @@ elif [ -f /forcefsck ]; then echo $"On the next boot fsck will be forced." fi -HALTARGS="-i -d" -if [ -f /poweroff -o ! -f /halt ]; then - HALTARGS="$HALTARGS -p" -fi - if [ "$command" = /sbin/halt -a -r /etc/ups/upsmon.conf -a -f /etc/killpower -a -f /etc/sysconfig/ups ] ; then . /etc/sysconfig/ups [ "$SERVER" = "yes" -a "$MODEL" != "NONE" -a -n "$MODEL" -a -n "$DEVICE" ] && $MODEL -k $DEVICE @@ -204,4 +199,7 @@ if [ -x /sbin/halt.local ]; then /sbin/halt.local fi +HALTARGS="-i -d" +[ -f /poweroff -o ! -f /halt ] && HALTARGS="$HALTARGS -p" + exec $command $HALTARGS |