From: Enrico Scholz Date: Mon, 20 Oct 2003 22:45:33 +0000 (+0000) Subject: added ulimits support X-Git-Tag: VERSION_0_10~1164 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=221c549c20a359fa3dc39614357137e174968d03;p=util-vserver.git added ulimits support git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@249 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index bd7a960..ca0b0af 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -33,6 +33,7 @@ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ + "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ "$_CHCONTEXT" "${CHCONTEXT_DISCONNECT[@]}" "${CHCONTEXT_OPTS[@]}" \ "$_SAVE_CTXINFO" "$VSERVER_DIR" \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_START[@]}" diff --git a/util-vserver/scripts/vserver.stop b/util-vserver/scripts/vserver.stop index 347d2d4..3e1ca8c 100644 --- a/util-vserver/scripts/vserver.stop +++ b/util-vserver/scripts/vserver.stop @@ -30,6 +30,7 @@ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-stop cd "$VSERVER_DIR"/vdir/ "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ + "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_STOP[@]}" diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index d3f6327..f031df7 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -26,6 +26,7 @@ cd "$VSERVER_DIR"/vdir/ exec \ "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ + "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" --suid "$user" . "$@"