X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvserver.suexec;h=3f35e90bc530db01c2cbf6693f04d48351113387;hb=a741f6faf2baae1e823d334012f6a09e6a1bda51;hp=963bdf5e4135b979d7409e40350ccd0350bea4b9;hpb=2822ba293eb308225c50d346930c47bf98d9927b;p=util-vserver.git

diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec
index 963bdf5..3f35e90 100644
--- a/scripts/vserver.suexec
+++ b/scripts/vserver.suexec
@@ -1,4 +1,4 @@
-# $Id: vserver.suexec,v 1.14 2005/07/15 19:01:06 ensc Exp $  --*- sh -*--
+# $Id: vserver.suexec 2599 2007-08-26 21:30:50Z dhozac $  --*- sh -*--
 
 # Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
@@ -22,25 +22,32 @@ test -z "$is_stopped" -o "$OPTION_INSECURE" || {
     exit 1
 }
 generateOptions  "$VSERVER_DIR"
+addtoCPUSET  "$VSERVER_DIR"
 
 user=$1
 shift
 
 cd "$VSERVER_DIR"/vdir/
 
+test -z "$OPTION_NONAMESPACE" || USE_VNAMESPACE=
+
 if $_VSERVER_INFO - FEATURE migrate; then
     if test -z "$is_stopped"; then
 	exec \
-        $_CHBIND      "${CHBIND_OPTS[@]}" \
+	"${NICE_CMD[@]}" \
+	"${CHBIND_CMD[@]}" \
 	$_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \
 	${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \
+	$_VTAG --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \
 	$_VCONTEXT $SILENT_OPT --migrate --chroot \
 	  --xid "$S_CONTEXT" --uid "$user" "${OPTS_VCONTEXT_ENTER[@]}" -- \
 	"$@"
     else
 	exec \
-	$_CHBIND      "${CHBIND_OPTS[@]}" \
+	"${NICE_CMD[@]}" \
+	"${CHBIND_CMD[@]}" \
 	$_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \
+	$_VTAG --create "${OPTS_VTAG_CREATE[@]}" --silent -- \
         $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \
 	$_VUNAME   --xid self --dir "$VSERVER_DIR"/uts     --missingok -- \
 	$_VUNAME   --xid self --set -t context="$VSERVER_DIR" -- \
@@ -50,7 +57,7 @@ if $_VSERVER_INFO - FEATURE migrate; then
 else
     exec \
     "${NICE_CMD[@]}" \
-    "$_CHBIND"       "${CHBIND_OPTS[@]}" \
+    "${CHBIND_CMD[@]}" \
     "$_EXEC_ULIMIT"  "$VSERVER_DIR/ulimits" \
     ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" --} \
     $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" -- \