summaryrefslogtreecommitdiff
path: root/man/journald.conf.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-03 11:34:11 +0200
committerLennart Poettering <lennart@poettering.net>2015-10-03 11:34:11 +0200
commit32252660954804747ae6b64c3921d5cb9a1c09c9 (patch)
treecd8d66e2e74b3b3c8e3b97eae94c3d418848f76e /man/journald.conf.xml
parent988a47964283b6a72f5ce117f287ebeb12e26d2d (diff)
downloadsystemd-32252660954804747ae6b64c3921d5cb9a1c09c9.tar.gz
man: document that the automatic journal limits are capped to 4G by default
Fixes #1441.
Diffstat (limited to 'man/journald.conf.xml')
-rw-r--r--man/journald.conf.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 109ca960fb..4464fe53ad 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -211,8 +211,9 @@
and use the smaller of the two values.</para>
<para>The first pair defaults to 10% and the second to 15% of
- the size of the respective file system. If the file system is
- nearly full and either <varname>SystemKeepFree=</varname> or
+ the size of the respective file system, but each value is
+ capped to 4G. If the file system is nearly full and either
+ <varname>SystemKeepFree=</varname> or
<varname>RuntimeKeepFree=</varname> are violated when
systemd-journald is started, the limit will be raised to the
percentage that is actually free. This means that if there was