From 39aa2c790f150cfc31fd59028c9cc397a7b9c8c9 Mon Sep 17 00:00:00 2001
From: Florian La Roche <laroche@redhat.com>
Date: Wed, 26 Jun 2002 09:08:11 +0000
Subject: - move HALTARGS down some more

---
 rc.d/init.d/halt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'rc.d/init.d')

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
-- 
cgit v1.2.1