rc-scripts/branches/vserver/rc.d: rc rc.shutdown

[baggins]

Author: baggins
Date: Tue Oct 18 20:13:42 2005
New Revision: 6461

Modified:
   rc-scripts/branches/vserver/rc.d/rc
   rc-scripts/branches/vserver/rc.d/rc.shutdown
Log:
- don't run halt/reboot if previous runlevel is unknown


Modified: rc-scripts/branches/vserver/rc.d/rc
==============================================================================
--- rc-scripts/branches/vserver/rc.d/rc	(original)
+++ rc-scripts/branches/vserver/rc.d/rc	Tue Oct 18 20:13:42 2005
@@ -145,7 +145,7 @@
 	unset LC_ALL
 	TMPDIR=/dev/null
 	export TMPDIR
-	exec /etc/rc.d/rc.shutdown $runlevel
+	exec /etc/rc.d/rc.shutdown $runlevel $previous
 else
 	if is_yes "$RUN_LDCONFIG" || [ ! -f /etc/ld.so.cache ] ; then
 		if [ -x /sbin/ldconfig ]; then

Modified: rc-scripts/branches/vserver/rc.d/rc.shutdown
==============================================================================
--- rc-scripts/branches/vserver/rc.d/rc.shutdown	(original)
+++ rc-scripts/branches/vserver/rc.d/rc.shutdown	Tue Oct 18 20:13:42 2005
@@ -26,6 +26,7 @@
 [ "${BASH+bash}" = bash ] && enable kill
 
 runlevel=$1
+previous=$2
 
 run_cmd "Sending all processes the TERM signal" killall5 -15
 sleep 5
@@ -35,10 +36,10 @@
 
 if [ "$runlevel" = "0" ] ; then
 	show "The system is halted"; ok
-	eval halt -d -p
+	[ "$previous" != "unknown" ] && eval halt -d -p
 else
 	show "Please stand by while rebooting the system"; ok
-	eval reboot -d
+	[ "$previous" != "unknown" ] && eval reboot -d
 fi
 
 # This must be last line !