naccyde / rpms / systemd

Forked from rpms/systemd a year ago
Clone
923a60
From 4464cd08f503af0459d779d92fb943aa3ef3f9a5 Mon Sep 17 00:00:00 2001
923a60
From: Lennart Poettering <lennart@poettering.net>
923a60
Date: Sat, 3 Oct 2015 11:34:11 +0200
923a60
Subject: [PATCH] man: document that the automatic journal limits are capped to
923a60
 4G by default
923a60
923a60
(cherry picked from commit 32252660954804747ae6b64c3921d5cb9a1c09c9)
923a60
Resolves: #1418547
923a60
---
923a60
 man/journald.conf.xml | 3 ++-
923a60
 1 file changed, 2 insertions(+), 1 deletion(-)
923a60
923a60
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
923a60
index c4f71e8873..46a498b673 100644
923a60
--- a/man/journald.conf.xml
923a60
+++ b/man/journald.conf.xml
923a60
@@ -210,7 +210,8 @@
923a60
         and use the smaller of the two values.</para>
923a60
 
923a60
         <para>The first pair defaults to 10% and the second to 15% of
923a60
-        the size of the respective file system. If the file system is
923a60
+        the size of the respective file system, but each value
923a60
+        is capped to 4G. If the file system is
923a60
         nearly full and either <varname>SystemKeepFree=</varname> or
923a60
         <varname>RuntimeKeepFree=</varname> is violated when
923a60
         systemd-journald is started, the value will be raised to