X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fjournald.conf.xml;h=a814ec1ec3570212f4c2a5fba07a1de67787940d;hp=b161b34e4ed2d2301ab4bff2a1831c8c76ee57a4;hb=3c8fa0fd0f99996088e42c5d48e164fdae4ada40;hpb=409dee2e44e7dc73d6bf00d782938e4cb4105f5b
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index b161b34e4..a814ec1ec 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
+ url="https://eprint.iacr.org/2013/397">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,21 +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 the
- journal shall always leave free for
- other uses if less than the disk space
- configured in
- SystemMaxUse= and
- RuntimeMaxUse= is
- available. Defaults to 15% of the size
- of the respective file
- system. SystemMaxFileSize=
+ control how much disk space
+ 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 there was enough
+ free space before and journal files were
+ created, and subsequently something
+ else causes the file system to fill
+ up, journald will stop using more
+ space, but it will not be removing
+ existing files to go reduce footprint
+ either.
+
+ SystemMaxFileSize=
and
RuntimeMaxFileSize=
control how large individual journal
@@ -282,10 +296,10 @@
E as units for the specified sizes
(equal to 1024, 1024²,... bytes).
Note that size limits are enforced
- synchronously when journal files
- are extended, and no explicit
- rotation step triggered by
- time is needed.
+ synchronously when journal files are
+ extended, and no explicit rotation
+ step triggered by time is
+ needed.
@@ -349,9 +363,17 @@
SyncIntervalSec=
- The timeout before synchronizing journal
- data to disk. After syncing, journal files have
- the OFFLINE state. Default timeout is 5 minutes.
+ The timeout before
+ synchronizing journal files to
+ disk. After syncing, journal files are
+ placed in the OFFLINE state. Note that
+ syncing is unconditionally done
+ immediately after a log message of
+ priority CRIT, ALERT or EMERG has been
+ logged. This setting hence applies
+ only to messages of the levels ERR,
+ WARNING, NOTICE, INFO, DEBUG. The
+ default timeout is 5 minutes.
@@ -377,7 +399,10 @@
systemd.journald.forward_to_kmsg=
and
systemd.journald.forward_to_console=.
-
+ When forwarding to the console, the
+ TTY to log to can be changed
+ with TTYPath=,
+ described below.