shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

man: beef up documentation on per-unit resource limits a bit

Browse Source 
Let's clarify that for user services some OS-defined limits bound the settings
in the unit files.

Fixes: #4232
This commit is contained in:
Lennart Poettering 2016-10-11 18:42:22 +02:00
parent 6dcda09cbf
commit f4c9356d13
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
man/systemd.exec.xml
View File

@ -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>