X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.suexec;h=8b19f5324bc6a480608c2d482443e8e885e46d3e;hb=d3dfb727f5db2f296c9e252a2a4645bb7c6394e8;hp=bc6a7dbc528363ac95e2b91f260d302e41e102bb;hpb=754434fee29f02326853e656fbf0a6bea5c63ea4;p=util-vserver.git diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index bc6a7db..8b19f53 100644 --- a/scripts/vserver.suexec +++ b/scripts/vserver.suexec @@ -29,12 +29,15 @@ 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[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ + $_VTAG --migrate "${OPTS_VTAG_ENTER[@]}" -- \ $_VCONTEXT $SILENT_OPT --migrate --chroot \ --xid "$S_CONTEXT" --uid "$user" "${OPTS_VCONTEXT_ENTER[@]}" -- \ "$@" @@ -42,6 +45,7 @@ if $_VSERVER_INFO - FEATURE migrate; then exec \ $_CHBIND "${CHBIND_OPTS[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ + $_VTAG --migrate "${OPTS_VTAG_ENTER[@]}" -- \ $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \