X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.suexec;h=85d92e08fec06ea81f2ed77345369de473a88552;hb=1171042cfba2870d05f6dcc771f6331fb5c9ad78;hp=d3f63271cbc9caa809bd82a137f2a805651ecd48;hpb=ffb682712dda87ea8993e5f9d59fb54366c3a795;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index d3f6327..85d92e0 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -17,7 +17,7 @@ isVserverRunning "$VSERVER_DIR" S_CONTEXT || : -generateOptions "$VSERVER_DIR" +generateOptions "$VSERVER_DIR" user=$1 shift @@ -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" . "$@"