diff options
| author | kib <kib@FreeBSD.org> | 2016-03-12 14:54:34 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-03-12 14:54:34 +0000 |
| commit | c25914807466d1029480aca4fac687af6e2e1918 (patch) | |
| tree | 69599a8cabd37a03a7aef687faef00d3bf85ab4c /bin/sh/sh.1 | |
| parent | 3c057e4b1fa0583a4ca025153e05a66869a4396e (diff) | |
| download | FreeBSD-src-c25914807466d1029480aca4fac687af6e2e1918.zip FreeBSD-src-c25914807466d1029480aca4fac687af6e2e1918.tar.gz | |
Fix handling of umtxp resource limit in sh(1)/ulimit(1), limits(1), add
login.conf(5) support.
Reviewed by: jilles
Sponsored by: The FreeBSD Foundation
Differential revision: https://reviews.freebsd.org/D5610
Diffstat (limited to 'bin/sh/sh.1')
| -rw-r--r-- | bin/sh/sh.1 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 9406779..1f2d67b 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -2615,7 +2615,7 @@ and not found. For aliases the alias expansion is printed; for commands and tracked aliases the complete pathname of the command is printed. -.It Ic ulimit Oo Fl HSabcdfklmnpstuvw Oc Op Ar limit +.It Ic ulimit Oo Fl HSabcdfklmnopstuvw Oc Op Ar limit Set or display resource limits (see .Xr getrlimit 2 ) . If @@ -2674,6 +2674,11 @@ kilobytes. The maximal resident set size of a process, in kilobytes. .It Fl n Ar nofiles The maximal number of descriptors that could be opened by a process. +.It Fl o Ar umtxp +The maximal number of process-shared locks +(see +.Xr pthread 3 ) +for this user ID. .It Fl p Ar pseudoterminals The maximal number of pseudo-terminals for this user ID. .It Fl s Ar stacksize |
