X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.exec.xml;h=b338899d81f7bc0665dba7350e747ebab7638bb4;hp=0747d0e1f974265d9f8f39392a4b1e1335fad4fb;hb=e45fc5e738b0b7700e8b4f3c4b25c58a49b44b27;hpb=2ca620c4ed28c01f285d869d0b22f22a360957da
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 0747d0e1f..b338899d8 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -250,7 +250,7 @@
processes. Takes a space-separated
list of CPU indices. This option may
be specified more than once in which
- case the specificed CPU affinity masks
+ case the specified CPU affinity masks
are merged. If the empty string is
assigned, the mask is reset, all
assignments prior to this will have no
@@ -708,14 +708,95 @@
LimitNICE=
LimitRTPRIO=
LimitRTTIME=
- These settings control
- various resource limits for executed
- processes. See
+ These settings set both
+ soft and hard limits of various resources for
+ executed processes. See
setrlimit2
for details. Use the string
infinity to
configure no limit on a specific
resource.
+
+
+ Limit directives and their equivalent with ulimit
+
+
+
+
+
+
+ Directive
+ ulimit equivalent
+
+
+
+
+ LimitCPU
+ ulimit -t
+
+
+ LimitFSIZE
+ ulimit -f
+
+
+ LimitDATA
+ ulimit -d
+
+
+ LimitSTACK
+ ulimit -s
+
+
+ LimitCORE
+ ulimit -c
+
+
+ LimitRSS
+ ulimit -m
+
+
+ LimitNOFILE
+ ulimit -n
+
+
+ LimitAS
+ ulimit -v
+
+
+ LimitNPROC
+ ulimit -u
+
+
+ LimitMEMLOCK
+ ulimit -l
+
+
+ LimitLOCKS
+ ulimit -x
+
+
+ LimitSIGPENDING
+ ulimit -i
+
+
+ LimitMSGQUEUE
+ ulimit -q
+
+
+ LimitNICE
+ ulimit -e
+
+
+ LimitRTPRIO
+ ulimit -r
+
+
+ LimitRTTIME
+ No equivalent
+
+
+
+
@@ -1115,7 +1196,7 @@
process. If set, this will override
the automated domain
transition. However, the policy still
- needs to autorize the transition. This
+ needs to authorize the transition. This
directive is ignored if SELinux is
disabled. If prefixed by
-, all errors will
@@ -1440,7 +1521,7 @@
$PATH
Colon-separated list
- of directiories to use when launching
+ of directories to use when launching
executables. Systemd uses a fixed
value of
/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin.