X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fjournald.conf.xml;h=f82130b9cfca1056e8ffbde8ac7ab804284c8532;hp=5ad0f02b30115c059e5491c666ef1ca01e869d23;hb=f4bad2bd2abe8ae260a99a5336145d11efe79892;hpb=01cf0ca850dd1c21e1c405a4493fe61d0c28d721
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 5ad0f02b3..f82130b9c 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=
@@ -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,13 +224,59 @@
+
+ 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=
+
+ Change the console TTY
+ to use if
+ ForwardToConsole=yes
+ is used. Defaults to
+ /dev/console.
+
+
ImportKernel=
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
@@ -240,6 +286,46 @@
traditional syslog service.
+
+
+ Storage=
+
+ Controls where to
+ store journal data. One of
+ volatile,
+ permanent,
+ 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
+ permanent 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
+ permanent but the
+ directory
+ /var/log/journal
+ is not created if needed, so that its
+ existance 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.
+