summaryrefslogtreecommitdiff
path: root/man/systemd-system.conf.xml
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2015-11-06 11:06:52 +0100
committerKarel Zak <kzak@redhat.com>2015-11-06 11:06:52 +0100
commit412ea7a936ebaa5342a4c2abf48b9e408e6ba5dc (patch)
tree1e28a600b8ac77f74528411153ad4c6a39d2ca02 /man/systemd-system.conf.xml
parenta6bff4a7428b9539d85618e3c91fcb60be93f3fa (diff)
core: support IEC suffixes for RLIMIT stuff
Let's make things more user-friendly and support for example LimitAS=16G rather than force users to always use LimitAS=16106127360. The change is relevant for options: [Default]Limit{FSIZE,DATA,STACK,CORE,RSS,AS,MEMLOCK,MSGQUEUE} The patch introduces config_parse_bytes_limit(), it's the same as config_parse_limit() but uses parse_size() tu support the suffixes. Addresses: https://github.com/systemd/systemd/issues/1772
Diffstat (limited to 'man/systemd-system.conf.xml')
-rw-r--r--man/systemd-system.conf.xml6
1 files changed, 4 insertions, 2 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>