X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Flegacy%2Fvserver;h=a956475567695e7cd44207ea0d2a71bdb4f303de;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=2e1b8cbd8dc2791b32600fdd7831554d55e6d0ac;hpb=5f917915b5648233b3e58488b56a718db3af397f;p=util-vserver.git

diff --git a/scripts/legacy/vserver b/scripts/legacy/vserver
index 2e1b8cb..a956475 100755
--- 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