chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd-wait-online: allow specific devices to be ignored
[elogind.git]
/
man
/
journald.conf.xml
diff --git
a/man/journald.conf.xml
b/man/journald.conf.xml
index 046609e401d6e09a9370b006104429db1acf83ef..4edcc003c0dd94ceef3ec55840d149f811e615ea 100644
(file)
--- a/
man/journald.conf.xml
+++ b/
man/journald.conf.xml
@@
-22,7
+22,8
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="journald.conf">
+<refentry id="journald.conf"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>journald.conf</title>
<productname>systemd</productname>
<refentryinfo>
<title>journald.conf</title>
<productname>systemd</productname>
@@
-44,22
+45,29
@@
<refnamediv>
<refname>journald.conf</refname>
<refnamediv>
<refname>journald.conf</refname>
- <refpurpose>Journal service configuration file</refpurpose>
+ <refname>journald.conf.d</refname>
+ <refpurpose>Journal service configuration files</refpurpose>
</refnamediv>
<refsynopsisdiv>
<para><filename>/etc/systemd/journald.conf</filename></para>
</refnamediv>
<refsynopsisdiv>
<para><filename>/etc/systemd/journald.conf</filename></para>
+ <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
+ <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
+ <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
- <para>Th
is file configures
various parameters of the
+ <para>Th
ese files configure
various parameters of the
systemd journal service,
<citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
</refsect1>
systemd journal service,
<citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
</refsect1>
+ <xi:include href="standard-conf.xml" xpointer="confd" />
+ <xi:include href="standard-conf.xml" xpointer="conf" />
+
<refsect1>
<title>Options</title>
<refsect1>
<title>Options</title>
@@
-115,9
+123,8
@@
value. If enabled (the default), data
objects that shall be stored in the
journal and are larger than a certain
value. If enabled (the default), data
objects that shall be stored in the
journal and are larger than a certain
- threshold are compressed with the XZ
- compression algorithm before they are
- written to the file
+ threshold are compressed before they
+ are written to the file
system.</para></listitem>
</varlistentry>
system.</para></listitem>
</varlistentry>
@@
-395,8
+402,8
@@
forwarding to syslog is enabled but no
syslog daemon is running, the
respective option has no effect. By
forwarding to syslog is enabled but no
syslog daemon is running, the
respective option has no effect. By
- default, only forwarding
to syslog and
-
wall is
enabled. These settings may be
+ default, only forwarding
wall is
+ enabled. These settings may be
overridden at boot time with the
kernel command line options
<literal>systemd.journald.forward_to_syslog=</literal>,
overridden at boot time with the
kernel command line options
<literal>systemd.journald.forward_to_syslog=</literal>,
@@
-405,9
+412,9
@@
and
<literal>systemd.journald.forward_to_wall=</literal>.
When forwarding to the console, the
and
<literal>systemd.journald.forward_to_wall=</literal>.
When forwarding to the console, the
- TTY to log to can be changed
- with <varname>TTYPath=</varname>,
-
described
below.</para></listitem>
+ TTY to log to can be changed
with
+ <varname>TTYPath=</varname>, described
+ below.</para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>