X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.suexec;h=8114145354df27c226a195cc50d570aa5b075756;hb=2f0464efba2a0571561ad0aaa864a42cbd731d4c;hp=8b19f5324bc6a480608c2d482443e8e885e46d3e;hpb=3564d8678a2134185e5e6e83083de027b359ca28;p=util-vserver.git diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index 8b19f53..8114145 100644 --- a/scripts/vserver.suexec +++ b/scripts/vserver.suexec @@ -34,18 +34,21 @@ 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[@]}" -- \ + $_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 --migrate "${OPTS_VTAG_ENTER[@]}" -- \ + $_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" -- \ @@ -55,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[@]}" -- \