mirror of
https://github.com/systemd/systemd.git
synced 2024-11-23 10:13:34 +08:00
man: document all the new paths
This commit is contained in:
parent
6378f257e7
commit
b83a59f8a7
@ -24,6 +24,8 @@
|
||||
<refsynopsisdiv>
|
||||
<para><simplelist>
|
||||
<member><filename>/etc/systemd/coredump.conf</filename></member>
|
||||
<member><filename>/run/systemd/coredump.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/coredump.conf</filename></member>
|
||||
<member><filename>/etc/systemd/coredump.conf.d/*.conf</filename></member>
|
||||
<member><filename>/run/systemd/coredump.conf.d/*.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/coredump.conf.d/*.conf</filename></member>
|
||||
|
@ -24,6 +24,8 @@
|
||||
<refsynopsisdiv>
|
||||
<para><simplelist>
|
||||
<member><filename>/etc/systemd/homed.conf</filename></member>
|
||||
<member><filename>/run/systemd/homed.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/homed.conf</filename></member>
|
||||
<member><filename>/etc/systemd/homed.conf.d/*.conf</filename></member>
|
||||
<member><filename>/run/systemd/homed.conf.d/*.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/homed.conf.d/*.conf</filename></member>
|
||||
|
@ -29,6 +29,8 @@
|
||||
<refsynopsisdiv>
|
||||
<para><simplelist>
|
||||
<member><filename>/etc/systemd/journal-remote.conf</filename></member>
|
||||
<member><filename>/run/systemd/journal-remote.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/journal-remote.conf</filename></member>
|
||||
<member><filename>/etc/systemd/journal-remote.conf.d/*.conf</filename></member>
|
||||
<member><filename>/run/systemd/journal-remote.conf.d/*.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/journal-remote.conf.d/*.conf</filename></member>
|
||||
|
@ -23,6 +23,8 @@
|
||||
|
||||
<refsynopsisdiv>
|
||||
<para><filename>/etc/systemd/journal-upload.conf</filename></para>
|
||||
<para><filename>/run/systemd/journal-upload.conf</filename></para>
|
||||
<para><filename>/usr/lib/systemd/journal-upload.conf</filename></para>
|
||||
<para><filename>/etc/systemd/journal-upload.conf.d/*.conf</filename></para>
|
||||
<para><filename>/run/systemd/journal-upload.conf.d/*.conf</filename></para>
|
||||
<para><filename>/usr/lib/systemd/journal-upload.conf.d/*.conf</filename></para>
|
||||
|
@ -27,6 +27,8 @@
|
||||
<refsynopsisdiv>
|
||||
<para><simplelist>
|
||||
<member><filename>/etc/systemd/logind.conf</filename></member>
|
||||
<member><filename>/run/systemd/logind.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/logind.conf</filename></member>
|
||||
<member><filename>/etc/systemd/logind.conf.d/*.conf</filename></member>
|
||||
<member><filename>/run/systemd/logind.conf.d/*.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/logind.conf.d/*.conf</filename></member>
|
||||
|
@ -29,6 +29,8 @@
|
||||
<refsynopsisdiv>
|
||||
<para><simplelist>
|
||||
<member><filename>/etc/systemd/networkd.conf</filename></member>
|
||||
<member><filename>/run/systemd/networkd.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/networkd.conf</filename></member>
|
||||
<member><filename>/etc/systemd/networkd.conf.d/*.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/networkd.conf.d/*.conf</filename></member>
|
||||
</simplelist></para>
|
||||
|
@ -24,7 +24,10 @@
|
||||
<refsynopsisdiv>
|
||||
<para><simplelist>
|
||||
<member><filename>/etc/systemd/oomd.conf</filename></member>
|
||||
<member><filename>/run/systemd/oomd.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/oomd.conf</filename></member>
|
||||
<member><filename>/etc/systemd/oomd.conf.d/*.conf</filename></member>
|
||||
<member><filename>/run/systemd/oomd.conf.d/*.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/oomd.conf.d/*.conf</filename></member>
|
||||
</simplelist></para>
|
||||
</refsynopsisdiv>
|
||||
|
@ -22,10 +22,14 @@
|
||||
</refnamediv>
|
||||
|
||||
<refsynopsisdiv>
|
||||
<para>
|
||||
<filename>/etc/systemd/pstore.conf</filename>
|
||||
<filename>/etc/systemd/pstore.conf.d/*</filename>
|
||||
</para>
|
||||
<para><simplelist>
|
||||
<member><filename>/etc/systemd/pstore.conf</filename></member>
|
||||
<member><filename>/run/systemd/pstore.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/pstore.conf</filename></member>
|
||||
<member><filename>/etc/systemd/pstore.conf.d/*.conf</filename></member>
|
||||
<member><filename>/run/systemd/pstore.conf.d/*.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/pstore.conf.d/*.conf</filename></member>
|
||||
</simplelist></para>
|
||||
</refsynopsisdiv>
|
||||
|
||||
<refsect1>
|
||||
|
@ -27,6 +27,8 @@
|
||||
<refsynopsisdiv>
|
||||
<para><simplelist>
|
||||
<member><filename>/etc/systemd/resolved.conf</filename></member>
|
||||
<member><filename>/run/systemd/resolved.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/resolved.conf</filename></member>
|
||||
<member><filename>/etc/systemd/resolved.conf.d/*.conf</filename></member>
|
||||
<member><filename>/run/systemd/resolved.conf.d/*.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/resolved.conf.d/*.conf</filename></member>
|
||||
|
@ -50,14 +50,19 @@
|
||||
<title>Configuration Directories and Precedence</title>
|
||||
|
||||
<para>The default configuration is set during compilation, so configuration is only needed when it is
|
||||
necessary to deviate from those defaults. The main configuration file is either in
|
||||
<filename>/usr/lib/systemd/</filename> or <filename>/etc/systemd/</filename> and contains commented out
|
||||
entries showing the defaults as a guide to the administrator. Local overrides can be created by creating
|
||||
drop-ins, as described below. The main configuration file can also be edited for this purpose (or a copy
|
||||
in <filename>/etc/</filename> if it's shipped in <filename>/usr/</filename>) however using drop-ins for
|
||||
local configuration is recommended over modifications to the main configuration file.</para>
|
||||
necessary to deviate from those defaults. The main configuration file is loaded from one of the
|
||||
listed directories in order of priority, only the first file found is used:
|
||||
<filename>/etc/systemd/</filename>,
|
||||
<filename>/run/systemd/</filename>,
|
||||
<filename>/usr/local/lib/systemd/</filename>,
|
||||
<filename>/usr/lib/systemd/</filename>.
|
||||
The vendor version of the file contains commented out entries showing the defaults as a guide to the
|
||||
administrator. Local overrides can also be created by creating drop-ins, as described below. The main
|
||||
configuration file can also be edited for this purpose (or a copy in <filename>/etc/</filename> if it's
|
||||
shipped under <filename>/usr/</filename>), however using drop-ins for local configuration is recommended
|
||||
over modifications to the main configuration file.</para>
|
||||
|
||||
<para>In addition to the "main" configuration file, drop-in configuration snippets are read from
|
||||
<para>In addition to the main configuration file, drop-in configuration snippets are read from
|
||||
<filename>/usr/lib/systemd/*.conf.d/</filename>, <filename>/usr/local/lib/systemd/*.conf.d/</filename>,
|
||||
and <filename>/etc/systemd/*.conf.d/</filename>. Those drop-ins have higher precedence and override the
|
||||
main configuration file. Files in the <filename>*.conf.d/</filename> configuration subdirectories are
|
||||
|
@ -24,6 +24,8 @@
|
||||
<refsynopsisdiv>
|
||||
<para><simplelist>
|
||||
<member><filename>/etc/systemd/sleep.conf</filename></member>
|
||||
<member><filename>/run/systemd/sleep.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/sleep.conf</filename></member>
|
||||
<member><filename>/etc/systemd/sleep.conf.d/*.conf</filename></member>
|
||||
<member><filename>/run/systemd/sleep.conf.d/*.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/sleep.conf.d/*.conf</filename></member>
|
||||
|
@ -28,12 +28,16 @@
|
||||
|
||||
<refsynopsisdiv>
|
||||
<para><filename>/etc/systemd/system.conf</filename>,
|
||||
<filename>/run/systemd/system.conf</filename>,
|
||||
<filename>/usr/lib/systemd/system.conf</filename>,
|
||||
<filename>/etc/systemd/system.conf.d/*.conf</filename>,
|
||||
<filename>/run/systemd/system.conf.d/*.conf</filename>,
|
||||
<filename>/usr/lib/systemd/system.conf.d/*.conf</filename></para>
|
||||
|
||||
<para><filename>~/.config/systemd/user.conf</filename>,
|
||||
<filename>/etc/systemd/user.conf</filename>,
|
||||
<filename>/run/systemd/user.conf</filename>,
|
||||
<filename>/usr/lib/systemd/user.conf</filename>,
|
||||
<filename>/etc/systemd/user.conf.d/*.conf</filename>,
|
||||
<filename>/run/systemd/user.conf.d/*.conf</filename>,
|
||||
<filename>/usr/lib/systemd/user.conf.d/*.conf</filename></para>
|
||||
@ -44,9 +48,10 @@
|
||||
|
||||
<para>When run as a system instance, <command>systemd</command> interprets the configuration file
|
||||
<filename>system.conf</filename> and the files in <filename>system.conf.d</filename> directories; when
|
||||
run as a user instance, it interprets the configuration file <filename>user.conf</filename> (either in
|
||||
the home directory of the user, or if not found, under <filename>/etc/systemd/</filename>) and the files
|
||||
in <filename>user.conf.d</filename> directories. These configuration files contain a few settings
|
||||
run as a user instance, it interprets the configuration file <filename>user.conf</filename> (in order of
|
||||
priority, in the home directory of the user and under <filename>/etc/systemd/</filename>,
|
||||
<filename>/run/systemd/</filename>, and <filename>/usr/lib/systemd/</filename>) and the files in
|
||||
<filename>user.conf.d</filename> directories. These configuration files contain a few settings
|
||||
controlling basic manager operations.</para>
|
||||
|
||||
<para>See
|
||||
|
@ -24,6 +24,8 @@
|
||||
<refsynopsisdiv>
|
||||
<para><simplelist>
|
||||
<member><filename>/etc/systemd/timesyncd.conf</filename></member>
|
||||
<member><filename>/run/systemd/timesyncd.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/timesyncd.conf</filename></member>
|
||||
<member><filename>/etc/systemd/timesyncd.conf.d/*.conf</filename></member>
|
||||
<member><filename>/run/systemd/timesyncd.conf.d/*.conf</filename></member>
|
||||
<member><filename>/usr/lib/systemd/timesyncd.conf.d/*.conf</filename></member>
|
||||
|
Loading…
Reference in New Issue
Block a user