added ulimits support
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Mon, 20 Oct 2003 22:45:33 +0000 (22:45 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Mon, 20 Oct 2003 22:45:33 +0000 (22:45 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@249 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/scripts/vserver.start
util-vserver/scripts/vserver.stop
util-vserver/scripts/vserver.suexec

index bd7a960..ca0b0af 100644 (file)
@@ -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[@]}"
index 347d2d4..3e1ca8c 100644 (file)
@@ -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[@]}"
 
index d3f6327..f031df7 100644 (file)
@@ -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" . "$@"