X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.suexec;h=88f1ae48069341fcb091644f1df139986d9f7f29;hb=dfa40e043f50b3ed0f89cdec01d0655c94c1e12e;hp=79cc584e3c5d8ce03f2b852d8799ddd66c64212f;hpb=550ff32eccc019653ab84dc04332dd0817a7c518;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index 79cc584..88f1ae4 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -31,13 +31,16 @@ cd "$VSERVER_DIR"/vdir/ if $_VSERVER_INFO - FEATURE migrate; then if test -z "$is_stopped"; then exec \ - $_CHBIND "${CHBIND_OPTS[@]}" \ + $_CHBIND "${CHBIND_OPTS[@]}" \ + $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ - $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" --uid "$user" -- \ + $_VCONTEXT $SILENT_OPT --migrate --chroot \ + --xid "$S_CONTEXT" --uid "$user" "${OPTS_VCONTEXT_ENTER[@]}" -- \ "$@" else exec \ - $_CHBIND "${CHBIND_OPTS[@]}" \ + $_CHBIND "${CHBIND_OPTS[@]}" \ + $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \