merge with 0.30.213

[util-vserver.git] / scripts / legacy / vserver

diff --git a/scripts/legacy/vserver b/scripts/legacy/vserver
index 2e1b8cb..a956475 100755 (executable)
--- a/scripts/legacy/vserver
+++ b/scripts/legacy/vserver
@@ -410,14 +410,13 @@ elif [ "$2" = "start" ] ; then
                # security context switch /vservers directory becomes a dead zone.
                cd $__DEFAULT_VSERVERDIR/$1
                export PATH=$DEFAULTPATH
-               # PLANETLAB execute /etc/rc.vinit first for backward compatibility
+               # XXX execute /etc/rc.vinit first for backward compatibility
                for CMD in "$VINIT_CMD $2" "$STARTCMD" ; do
-                   $NICECMD $_CHBIND_COMPAT $SILENT $IPOPT --bcast $IPROOTBCAST \
-                       $_CHCONTEXT_COMPAT $SILENT $DISCONNECT $CAPS $FLAGS $CTXOPT $HOSTOPT $DOMAINOPT --secure \
-                       $_SAVE_S_CONTEXT $__PKGSTATEDIR/$1.ctx \
-                       $_CAPCHROOT $CHROOTOPT . $CMD
+                       $NICECMD \
+                               $_CHCONTEXT_COMPAT $SILENT $DISCONNECT $CAPS $FLAGS $CTXOPT $HOSTOPT $DOMAINOPT --secure \
+                               $_SAVE_S_CONTEXT $__PKGSTATEDIR/$1.ctx \
+                               $_CAPCHROOT $CHROOTOPT . $CMD
                done
-
                sleep 2
                test ! -x $__CONFDIR/$1.sh || $__CONFDIR/$1.sh post-start $1
        fi
@@ -490,11 +489,11 @@ elif [ "$2" = "stop" ] ; then
 
                cd $__DEFAULT_VSERVERDIR/$1
                export PATH=$DEFAULTPATH
-               # PLANETLAB execute /etc/rc.vinit first for backward compatibility
+               # XXX execute /etc/rc.vinit first for backward compatibility
                for CMD in "$VINIT_CMD $2" "$STOPCMD" ; do
-                   $_CHBIND_COMPAT $SILENT $IPOPT --bcast $IPROOTBCAST \
+                       $_CHBIND_COMPAT $SILENT $IPOPT --bcast $IPROOTBCAST \
                        $_CHCONTEXT_COMPAT $SILENT $CAPS --secure --ctx $S_CONTEXT \
-                       $_CAPCHROOT . $CMD
+                       $_CAPCHROOT . $STOPCMD
                done
 
                if test "$IS_MINIT"; then