X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fjournald.conf.xml;h=e0796e1cce4841363664b4e7a2a2b893f58847ec;hb=41add995cf7d61e299cb859a7f63117e2b4de312;hp=9219b3daaf081b4dd5357fd530bf74c2a35e8f13;hpb=d07f7b9ef2835c290d6beadebd17d15308608eea;p=elogind.git
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 9219b3daa..e0796e1cc 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -130,15 +130,15 @@
by
journalctl1's
- command), forward secure sealing (FSS)
+ command), Forward Secure Sealing (FSS)
for all persistent journal files is
enabled. FSS is based on Seekable
Sequential Key Generators by
- G. A. Marson and B. Poettering and
- may be used to protect journal files
- from unnoticed
- alteration.
+ G. A. Marson and B. Poettering
+ (doi:10.1007/978-3-642-40203-6_7)
+ and may be used to protect journal files
+ from unnoticed alteration.
@@ -155,7 +155,7 @@
into the system journal. If
uid, any user ID
will get his own journal files
- regardless whether it belongs to a
+ regardless of whether it belongs to a
system service or refers to a real
logged in user. If
none, journal files
@@ -250,20 +250,35 @@
SystemMaxUse=
and RuntimeMaxUse=
control how much disk space the
- journal may use up at
- maximum. Defaults to 10% of the size
- of the respective file
- system. SystemKeepFree=
- and
+ journal may use up at maximum.
+ SystemKeepFree= and
RuntimeKeepFree=
control how much disk space
- systemd-journald shall always leave
- free for other uses. Defaults to 15%
- of the size of the respective file
- system. systemd-journald will respect
- both limits, i.e. use the smaller of
- the two values.
- SystemMaxFileSize=
+ systemd-journald shall leave free for
+ other uses.
+ systemd-journald
+ will respect both limits and use the
+ smaller of the two values.
+
+ 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
+ SystemKeepFree= or
+ RuntimeKeepFree= is
+ violated when systemd-journald is
+ started, the value will be raised to
+ percentage that is actually free. This
+ means that if before there was enough
+ free space and journal files were
+ created, and subsequently something
+ else causes the file system to fill
+ up, journald will stop using more
+ space, but it'll will not removing
+ existing files to go reduce footprint
+ either.
+
+ SystemMaxFileSize=
and
RuntimeMaxFileSize=
control how large individual journal
@@ -355,7 +370,7 @@
syncing is unconditionally done
immediately after a log message of
priority CRIT, ALERT or EMERG has been
- logged, this setting hence applies
+ logged. This setting hence applies
only to messages of the levels ERR,
WARNING, NOTICE, INFO, DEBUG. The
default timeout is 5 minutes.