shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

man: document paths under /usr/local in standard-conf.xml

Browse Source 
standard-conf.xml is currently included by:
man/binfmt.d.xml
man/environment.d.xml
man/modules-load.d.xml
man/sysctl.d.xml
man/coredump.conf.xml
man/journal-remote.conf.xml
man/journal-upload.conf.xml
man/journald.conf.xml
man/logind.conf.xml
man/networkd.conf.xml
man/resolved.conf.xml
man/systemd-sleep.conf.xml
man/systemd-system.conf.xml

All those programs actually use CONF_PATHS_NULSTR or CONF_PATHS_STRV,
so this changes the documentation to match code.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-01-02 13:53:49 +01:00
parent 514fbdd78b
commit 5ae4336abc
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
man/standard-conf.xml
View File

@ -11,18 +11,16 @@
<refsection id='confd'>
<title>Configuration Directories and Precedence</title>
<para>Configuration files are read from directories in
<filename>/etc/</filename>, <filename>/run/</filename>, and
<filename>/usr/lib/</filename>, in order of precedence.
Each configuration file in these configuration directories shall be named in
the style of <filename><replaceable>filename</replaceable>.conf</filename>.
Files in <filename>/etc/</filename> override files with the same name in
<filename>/run/</filename> and <filename>/usr/lib/</filename>. Files in
<filename>/run/</filename> override files with the same name in
<filename>/usr/lib/</filename>.</para>
<para>Configuration files are read from directories in <filename>/etc/</filename>, <filename>/run/</filename>,
<filename>/usr/local/lib/</filename>, and <filename>/usr/lib/</filename>, in order of precedence. Each
configuration file in these configuration directories shall be named in the style of
<filename><replaceable>filename</replaceable>.conf</filename>. Files in <filename>/etc/</filename> override files
with the same name in <filename>/run/</filename>, <filename>/usr/local/lib/</filename>, and
<filename>/usr/lib/</filename>. Files in <filename>/run/</filename> override files with the same name under
<filename>/usr/</filename>.</para>
<para>Packages should install their configuration files in
<filename>/usr/lib/</filename>. Files in <filename>/etc/</filename> are
<para>Packages should install their configuration files in <filename>/usr/lib/</filename> (distribution packages)
or <filename>/usr/local/lib/</filename> (local installs). Files in <filename>/etc/</filename> are
reserved for the local administrator, who may use this logic to override the
configuration files installed by vendor packages. All configuration files
are sorted by their filename in lexicographic order, regardless of which of
@ -52,7 +50,8 @@
<para>When packages need to customize the configuration, they can
install configuration snippets in
<filename>/usr/lib/systemd/*.conf.d/</filename>. Files in
<filename>/usr/lib/systemd/*.conf.d/</filename> or
<filename>/usr/local/lib/systemd/*.conf.d/</filename>. Files in
<filename>/etc/</filename> are reserved for the local
administrator, who may use this logic to override the
configuration files installed by vendor packages. The main