X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.suexec;h=c7dfa0492f33b9e21984149a032c15da672e09d9;hb=f5d5a2f7636afdb9eb9ae7d5a80b2aaf84d9b7af;hp=b91f7f380053c81d420a829165c35845cbf5444e;hpb=f15ecabbb38a6e332eaf97194534e4af07e7b646;p=util-vserver.git diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index b91f7f3..c7dfa04 100644 --- a/scripts/vserver.suexec +++ b/scripts/vserver.suexec @@ -34,17 +34,26 @@ 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 -- \ + $_VSPACE --new "${OPTS_VSPACE[@]}" -- \ $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ + $_VSPACE --set "${OPTS_VSPACE[@]}" -- \ $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \ $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT -- \ @@ -52,8 +61,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[@]}" -- \