X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.suexec;h=02aeef23bb5b859ac136fcbebde985516918855f;hb=e5d96f93d0de60ca5fe2f30c09aef449e39e3e89;hp=bc6a7dbc528363ac95e2b91f260d302e41e102bb;hpb=754434fee29f02326853e656fbf0a6bea5c63ea4;p=util-vserver.git diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index bc6a7db..02aeef2 100644 --- a/scripts/vserver.suexec +++ b/scripts/vserver.suexec @@ -29,19 +29,28 @@ 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[@]}" \ + "${IONICE_CMD[@]}" \ + "${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[@]}" \ + "${IONICE_CMD[@]}" \ + "${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,8 +59,9 @@ if $_VSERVER_INFO - FEATURE migrate; then fi else exec \ + "${IONICE_CMD[@]}" \ "${NICE_CMD[@]}" \ - "$_CHBIND" "${CHBIND_OPTS[@]}" \ + "${CHBIND_CMD[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" --} \ $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" -- \