From 555297f3a5524fdd8060aea3d0531579f01c9148 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 15 Jul 2005 19:01:06 +0000 Subject: [PATCH] readded the limit-ulimits-per-vserver stuff due to popular requests (http://savannah.nongnu.org/bugs/?func=detailitem&item_id=12840) git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2155 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vserver.start | 3 ++- util-vserver/scripts/vserver.suexec | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index a2ed8e2..6d347ce 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -108,7 +108,8 @@ pushd "$VSERVER_DIR"/vdir/ >/dev/null is_configured=1 if $_VSERVER_INFO - FEATURE migrate; then ${NICE_CMD[@]} \ - $_CHBIND "${CHBIND_OPTS[@]}" -- \ + $_CHBIND "${CHBIND_OPTS[@]}" -- \ + $_EXEC_ULIMIT "$VSERVER_DIR"/ulimits \ $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index 2466c21..88f1ae4 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -31,14 +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" "${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" -- \ -- 1.8.1.5