diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-11-09 17:02:12 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-11-09 17:02:12 +0100 |
| commit | dfa1f158749161ca671e8aa589b62019ad9c4e2a (patch) | |
| tree | fbea4f87f85b2f834d6ec2b233e54f3df848f59c /man | |
| parent | f094cb287ed535a8f45e0ce61a57a06bec642876 (diff) | |
| parent | 412ea7a936ebaa5342a4c2abf48b9e408e6ba5dc (diff) | |
Merge pull request #1794 from karelzak/size_limit
core: support IEC suffixes for RLIMIT stuff
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-system.conf.xml | 6 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 8dad0e0f59..54ce992b85 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -342,8 +342,10 @@ resource limits for units. See <citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</manvolnum></citerefentry> for details. Use the string <varname>infinity</varname> to - configure no limit on a specific resource. These settings may - be overridden in individual units using the corresponding + configure no limit on a specific resource. The multiplicative suffixes + K (=1024), M (=1024*1024) and so on for G, T, P and E may be used for + resource limits measured in bytes (e.g. DefaultLimitAS=16G). These + settings may be overridden in individual units using the corresponding LimitXXX= directives. Note that these resource limits are only defaults for units, they are not applied to PID 1 itself.</para></listitem> diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index c0ecf92419..7462960000 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -568,7 +568,9 @@ of various resources for executed processes. See <citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</manvolnum></citerefentry> for details. Use the string <varname>infinity</varname> to - configure no limit on a specific resource.</para></listitem> + configure no limit on a specific resource. The multiplicative suffixes + K (=1024), M (=1024*1024) and so on for G, T, P and E may be used for + resource limits measured in bytes (e.g. LimitAS=16G).</para></listitem> <table> <title>Limit directives and their equivalent with ulimit</title> |