X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fjournald.conf.xml;h=d7caea83cce6018be4d8b6a1eaba63c403b917c2;hp=28ad2edacff99761f75056aac4e917dd2f432c83;hb=941e990db1f2682abaa2966b1c48602901d0c599;hpb=0d9243f022d244632b1ab26cfc8b46794b7fc5d6
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 28ad2edac..d7caea83c 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -128,7 +128,7 @@
prefixed with
System apply to the
journal files when stored on a
- persistant file system, more
+ persistent file system, more
specifically
/var/log/journal. The
options prefixed with
@@ -144,9 +144,9 @@
exists. Otherwise only the latter
applies. Note that this means that
during early boot and if the
- administrator disabled persistant
+ administrator disabled persistent
logging only the latter options apply,
- while the former apply if persistant
+ while the former apply if persistent
logging is enabled and the system is
fully booted
up. SystemMaxUse=
@@ -174,7 +174,7 @@
influences the granularity in which
disk space is made available through
rotation, i.e. deletion of historic
- data. Defaults to one eigth of the
+ data. Defaults to one eighth of the
values configured with
SystemMaxUse= and
RuntimeMaxUse=, so
@@ -212,10 +212,10 @@
to syslog is enabled. These settings
may be overridden at boot time with the
kernel command line options
- systemd_journald.forward_to_syslog=,
- systemd_journald.forward_to_kmsg=
+ systemd.journald.forward_to_syslog=,
+ systemd.journald.forward_to_kmsg=
and
- systemd_journald.forward_to_console=. If
+ systemd.journald.forward_to_console=. If
forwarding to the kernel log buffer and
ImportKernel= is
enabled at the same time care is taken
@@ -224,6 +224,42 @@
+
+ MaxLevelStore=
+ MaxLevelSyslog=
+ MaxLevelKMsg=
+ MaxLevelConsole=
+
+ Controls the maximum
+ log level of messages that are stored
+ on disk, forwarded to syslog, kmsg or
+ the console (if that is enabled, see
+ above). As argument, takes one of
+ emerg,
+ alert,
+ crit,
+ err,
+ warning,
+ notice,
+ info,
+ debug or integer
+ values in the range of 0..7 (corresponding
+ to the same levels). Messages equal or below
+ the log level specified are
+ stored/forwarded, messages above are
+ dropped. Defaults to
+ debug for
+ MaxLevelStore= and
+ MaxLevelSyslog=, to
+ ensure that the all messages are
+ written to disk and forwarded to
+ syslog. Defaults to
+ notice for
+ MaxLevelKMsg= and
+ info for
+ MaxLevelConsole=.
+
+
TTYPath=
@@ -240,7 +276,7 @@
Controls whether
kernel log messages shall be stored in
the journal. Takes a boolean argument
- and defaults to enabled. Note that
+ and defaults to disabled. Note that
currently only one userspace service
can read kernel messages at a time,
which means that kernel log message
@@ -250,6 +286,46 @@
traditional syslog service.
+
+
+ Storage=
+
+ Controls where to
+ store journal data. One of
+ volatile,
+ persistent,
+ auto and
+ none. If
+ volatile journal
+ log data will be stored only in
+ memory, i.e. below the
+ /run/log/journal
+ hierarchy (which is created if
+ needed). If
+ persistent data will
+ be stored preferably on disk,
+ i.e. below the
+ /var/log/journal
+ hierarchy (which is created if
+ needed), with a fallback to
+ /run/log/journal
+ (which is created if needed), during
+ early boot and if the disk is not
+ writable. auto is
+ similar to
+ persistent but the
+ directory
+ /var/log/journal
+ is not created if needed, so that its
+ existence controls where log data
+ goes. none turns
+ off all storage, all log data received
+ will be dropped. Forwarding to other
+ targets, such as the console, the
+ kernel log buffer or a syslog daemon
+ will still work however. Defaults to
+ auto.
+