X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fvserver.suexec;h=e2afcb5dcb2d5da0730b26913175371f2bf6c6b4;hb=b7785f953cf988346d0f36c5852af39db3d1b00c;hp=655a9e6836ab5dd5e042360c628b04bf500e25f1;hpb=fc28db1eb4146796ec27c2fb15780d6303120261;p=util-vserver.git

diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec
index 655a9e6..e2afcb5 100644
--- a/scripts/vserver.suexec
+++ b/scripts/vserver.suexec
@@ -1,4 +1,4 @@
-# $Id: vserver.suexec 2300 2006-09-12 12:16:53Z dhozac $  --*- sh -*--
+# $Id: vserver.suexec 2669 2008-01-22 09:19:57Z dhozac $  --*- sh -*--
 
 # Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
@@ -29,19 +29,26 @@ 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" -- } \
+	$_VSPACE --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \
+	$_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" -- \
@@ -51,7 +58,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[@]}" -- \