X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.suexec;h=f249df3195febf843072f1f829c216875e59b474;hb=7751466c148d6f751c60b1b0f06b604840da13de;hp=bc6a7dbc528363ac95e2b91f260d302e41e102bb;hpb=754434fee29f02326853e656fbf0a6bea5c63ea4;p=util-vserver.git diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index bc6a7db..f249df3 100644 --- a/scripts/vserver.suexec +++ b/scripts/vserver.suexec @@ -29,19 +29,25 @@ 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" -- \ @@ -51,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[@]}" -- \