diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-10-11 18:42:22 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-10-11 18:42:22 +0200 |
commit | f4c9356d133a7453dc9ed4e499a3edeb62c90fa9 (patch) | |
tree | b8481ba097ede10cd85db86f80d9ba830fddec45 /man | |
parent | 6dcda09cbfb698c6b50fcab2ef52a540766f25bf (diff) | |
download | systemd-f4c9356d133a7453dc9ed4e499a3edeb62c90fa9.tar.gz systemd-f4c9356d133a7453dc9ed4e499a3edeb62c90fa9.tar.bz2 systemd-f4c9356d133a7453dc9ed4e499a3edeb62c90fa9.zip |
man: beef up documentation on per-unit resource limits a bit
Let's clarify that for user services some OS-defined limits bound the settings
in the unit files.
Fixes: #4232
Diffstat (limited to 'man')
-rw-r--r-- | man/systemd.exec.xml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 5e6787338d..4d5e5b1f32 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -703,8 +703,19 @@ <varname>MemoryLimit=</varname> is a more powerful (and working) replacement for <varname>LimitRSS=</varname>.</para> + <para>For system units these resource limits may be chosen freely. For user units however (i.e. units run by a + per-user instance of + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>), these limits are + bound by (possibly more restrictive) per-user limits enforced by the OS.</para> + + <para>Resource limits not configured explicitly for a unit default to the value configured in the various + <varname>DefaultLimitCPU=</varname>, <varname>DefaultLimitFSIZE=</varname>, … options available in + <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, and – + if not configured there – the kernel or per-user defaults, as defined by the OS (the latter only for user + services, see above).</para> + <table> - <title>Limit directives and their equivalent with ulimit</title> + <title>Resource limit directives, their equivalent <command>ulimit</command> shell commands and the unit used</title> <tgroup cols='3'> <colspec colname='directive' /> @@ -713,7 +724,7 @@ <thead> <row> <entry>Directive</entry> - <entry>ulimit equivalent</entry> + <entry><command>ulimit</command> equivalent</entry> <entry>Unit</entry> </row> </thead> |