--- vserver.orig Sat Nov 9 23:12:12 2002 +++ vserver Mon Nov 18 05:42:58 2002 @@ -163,6 +163,7 @@ echo " vserver name service service-name start/stop/restart/status" echo " start : Starts the various services in the vserver, runlevel 3" echo " stop : Ends all services and kills the remaining processes" + echo " kill : Kills any remaining processes - for reboot(2) support" echo " running : Tells if a virtual server is running" echo " It returns proper exit code, so you can use it as a test" echo " status : Tells some information about a vserver" @@ -451,8 +452,9 @@ echo $NB processes running echo Vserver uptime: `$USR_LIB_VSERVER/filetime /var/run/vservers/$1.ctx` fi -elif [ "$2" = "stop" ] ; then - echo Stopping the virtual server $1 +elif [ "$2" = "stop" ] || [ "$2" = "kill" ] ; then + [ "$2" = "stop" ] && echo Stopping the virtual server $1 + [ "$2" = "kill" ] && echo Killing the virtual server '- probably it was called reboot(2)' $1 IPROOT= IPROOTMASK= IPROOTBCAST= @@ -487,11 +489,11 @@ cd /vservers/$1 IPOPT=`setipopt $IPROOT` export PATH=/sbin:/usr/sbin:/bin:/usr/bin - $CHBIND_CMD $SILENT $IPOPT --bcast $IPROOTBCAST \ + [ "$2" = "stop" ] && $CHBIND_CMD $SILENT $IPOPT --bcast $IPROOTBCAST \ $CHCONTEXT_CMD $SILENT --secure --ctx $S_CONTEXT \ $CAPCHROOT_CMD . $STOPCMD - echo sleeping 5 seconds - sleep 5 + [ "$2" = "stop" ] && echo sleeping 5 seconds + [ "$2" = "stop" ] && sleep 5 echo Killing all processes $CHBIND_CMD --silent $IPOPT --bcast $IPROOTBCAST \ $CHCONTEXT_CMD --secure --silent --ctx $S_CONTEXT \