diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-04-09 16:13:32 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-04-09 16:15:01 -0700 |
| commit | 2d698b6e42d8dca191ac795ef5dba3bf62496eec (patch) | |
| tree | ac5e0b67043c50f49160e9fe407435706cf30444 /builtins/ulimit.def | |
| parent | f1250933e4a2ac09a3d0b25b3877068e12f44da5 (diff) | |
| download | vyatta-bash-2d698b6e42d8dca191ac795ef5dba3bf62496eec.tar.gz vyatta-bash-2d698b6e42d8dca191ac795ef5dba3bf62496eec.zip | |
Integrate bash 3.2 version
This is merge of current Debian stable (Lenny) version of Bash
with Vyatta changes.
Diffstat (limited to 'builtins/ulimit.def')
| -rw-r--r-- | builtins/ulimit.def | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/builtins/ulimit.def b/builtins/ulimit.def index 1fe2a7a..2d2e7b2 100644 --- a/builtins/ulimit.def +++ b/builtins/ulimit.def @@ -35,19 +35,19 @@ option is given, it is interpreted as follows: -c the maximum size of core files created -d the maximum size of a process's data segment -e the maximum scheduling priority (`nice') - -f the maximum size of files created by the shell - -i the maximum number of pending signals + -f the maximum size of files written by the shell and its children + -i the maximum number of pending signals -l the maximum size a process may lock into memory -m the maximum resident set size -n the maximum number of open file descriptors -p the pipe buffer size - -q the maximum number of bytes in POSIX message queues - -r the maximum rt priority + -q the maximum number of bytes in POSIX message queues + -r the maximum real-time scheduling priority -s the maximum stack size -t the maximum amount of cpu time in seconds -u the maximum number of user processes -v the size of virtual memory - -x the maximum number of file locks + -x the maximum number of file locks If LIMIT is given, it is the new value of the specified resource; the special LIMIT values `soft', `hard', and `unlimited' stand for @@ -205,8 +205,8 @@ static RESOURCE_LIMITS limits[] = { { 'd', RLIMIT_DATA, 1024, "data seg size", "kbytes" }, #endif #ifdef RLIMIT_NICE - { 'e', RLIMIT_NICE, 1, "max nice", (char *)NULL}, -#endif /* RLIMIT_NICE */ + { 'e', RLIMIT_NICE, 1, "scheduling priority", (char *)NULL }, +#endif { 'f', RLIMIT_FILESIZE, 1024, "file size", "blocks" }, #ifdef RLIMIT_SIGPENDING { 'i', RLIMIT_SIGPENDING, 1, "pending signals", (char *)NULL }, @@ -223,8 +223,8 @@ static RESOURCE_LIMITS limits[] = { { 'q', RLIMIT_MSGQUEUE, 1, "POSIX message queues", "bytes" }, #endif #ifdef RLIMIT_RTPRIO - { 'r', RLIMIT_RTPRIO, 1, "max rt priority", (char *)NULL}, -#endif /* RLIMIT_RTPRIO */ + { 'r', RLIMIT_RTPRIO, 1, "real-time priority", (char *)NULL }, +#endif #ifdef RLIMIT_STACK { 's', RLIMIT_STACK, 1024, "stack size", "kbytes" }, #endif |