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

diff --git a/scripts/legacy/vserver b/scripts/legacy/vserver
index 2e1b8cb..9ff978f 100755
--- a/scripts/legacy/vserver
+++ b/scripts/legacy/vserver
@@ -396,7 +396,7 @@ elif [ "$2" = "start" ] ; then
 			DOMAINOPT="--domainname $S_DOMAINNAME"
 		fi
 		if [ "$S_NICE" != "" ] ; then
-			NICECMD="nice -n $S_NICE"
+			NICECMD="nice -$S_NICE"
 		fi
 		mkdir -p $__PKGSTATEDIR
 		chmod 700 $__PKGSTATEDIR
@@ -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,10 @@ 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 \
 			$_CHCONTEXT_COMPAT $SILENT $CAPS --secure --ctx $S_CONTEXT \
-			$_CAPCHROOT . $CMD
+			$_CAPCHROOT . $STOPCMD
 		done
 
 		if test "$IS_MINIT"; then
@@ -507,8 +505,7 @@ elif [ "$2" = "stop" ] ; then
 		fi
 
 		echo Killing all processes
-		$_CHBIND_COMPAT --silent $IPOPT --bcast $IPROOTBCAST \
-			$_CHCONTEXT_COMPAT $CAPS --secure --silent --ctx $S_CONTEXT \
+		$_CHCONTEXT_COMPAT $CAPS --secure --silent --ctx $S_CONTEXT \
 			$_VSERVERKILLALL
 	fi
 	# We umount anyway, because "enter" establish the mount
@@ -579,8 +576,7 @@ elif [ "$2" = "suexec" ] ; then
 			. $__PKGSTATEDIR/$VSERVER.ctx
 			cd $__DEFAULT_VSERVERDIR/$VSERVER
 			export PATH=$DEFAULTPATH
-			exec $_CHBIND_COMPAT $SILENT $IPOPT --bcast $IPROOTBCAST \
-				$_CHCONTEXT_COMPAT $SILENT $FLAGS $CAPS --secure --ctx $S_CONTEXT \
+			exec $_CHCONTEXT_COMPAT $SILENT $FLAGS $CAPS --secure --ctx $S_CONTEXT \
 				$_CAPCHROOT --suid $USERID . "$@"
 		else
 			test -x $__CONFDIR/$1.sh && $__CONFDIR/$1.sh pre-start $1
@@ -600,8 +596,7 @@ elif [ "$2" = "suexec" ] ; then
 			mkdir -p $__PKGSTATEDIR
 			cd $__DEFAULT_VSERVERDIR/$VSERVER
 			export PATH=$DEFAULTPATH
-			exec $_CHBIND_COMPAT $SILENT $IPOPT --bcast $IPROOTBCAST \
-				$_CHCONTEXT_COMPAT $SILENT $FLAGS $CAPS --secure $CTXOPT $HOSTOPT $DOMAINOPT \
+			exec $_CHCONTEXT_COMPAT $SILENT $FLAGS $CAPS --secure $CTXOPT $HOSTOPT $DOMAINOPT \
 				$_SAVE_S_CONTEXT $__PKGSTATEDIR/$VSERVER.ctx \
 				$_CAPCHROOT --suid $USERID $CHROOTOPT . "$@"
 		fi