summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-06-24 21:02:16 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-06-24 21:06:06 -0400
commit670b110c3b59dfa335ac43065b2038400d1d04a9 (patch)
tree8fcfc419e66b8ff45963e5fb25cfa71705ec2f3a /man
parent30cb029b8bf6578ed1595d87abdedc6923fd4608 (diff)
journald: fix space limits reporting
Reporting of the free space was bogus, since the remaining space was compared with the maximum allowed, instead of the current use being compared with the maximum allowed. Simplify and fix by reporting limits directly at the point where they are calculated. Also, assign a UUID to the message.
Diffstat (limited to 'man')
-rw-r--r--man/journald.conf.xml22
1 files changed, 16 insertions, 6 deletions
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 26f47f8975..6e43914f23 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -237,7 +237,17 @@
while the former apply if persistent
logging is enabled and the system is
fully booted
- up. <varname>SystemMaxUse=</varname>
+ up. <command>journalctl</command> and
+ <command>systemd-journald</command>
+ ignore all files with names not ending
+ with <literal>.journal</literal> or
+ <literal>.journal~</literal>, so only
+ such files, located in the appropriate
+ directories, are taken into account
+ when calculating current disk usage.
+ </para>
+
+ <para><varname>SystemMaxUse=</varname>
and <varname>RuntimeMaxUse=</varname>
control how much disk space the
journal may use up at
@@ -271,11 +281,11 @@
values in bytes or use K, M, G, T, P,
E as units for the specified sizes
(equal to 1024, 1024²,... bytes).
- Note that size limits are
- enforced synchronously to journal
- files as they are extended, and need
- no explicit rotation step triggered by
- time.</para></listitem>
+ Note that size limits are enforced
+ synchronously when journal files
+ are extended, and no explicit
+ rotation step triggered by
+ time is needed.</para></listitem>
</varlistentry>
<varlistentry>