Skip to content

Commit 5ae4336

Browse files
committed
man: document paths under /usr/local in standard-conf.xml
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.
1 parent 514fbdd commit 5ae4336

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

man/standard-conf.xml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,16 @@
1111
<refsection id='confd'>
1212
<title>Configuration Directories and Precedence</title>
1313

14-
<para>Configuration files are read from directories in
15-
<filename>/etc/</filename>, <filename>/run/</filename>, and
16-
<filename>/usr/lib/</filename>, in order of precedence.
17-
Each configuration file in these configuration directories shall be named in
18-
the style of <filename><replaceable>filename</replaceable>.conf</filename>.
19-
Files in <filename>/etc/</filename> override files with the same name in
20-
<filename>/run/</filename> and <filename>/usr/lib/</filename>. Files in
21-
<filename>/run/</filename> override files with the same name in
22-
<filename>/usr/lib/</filename>.</para>
14+
<para>Configuration files are read from directories in <filename>/etc/</filename>, <filename>/run/</filename>,
15+
<filename>/usr/local/lib/</filename>, and <filename>/usr/lib/</filename>, in order of precedence. Each
16+
configuration file in these configuration directories shall be named in the style of
17+
<filename><replaceable>filename</replaceable>.conf</filename>. Files in <filename>/etc/</filename> override files
18+
with the same name in <filename>/run/</filename>, <filename>/usr/local/lib/</filename>, and
19+
<filename>/usr/lib/</filename>. Files in <filename>/run/</filename> override files with the same name under
20+
<filename>/usr/</filename>.</para>
2321

24-
<para>Packages should install their configuration files in
25-
<filename>/usr/lib/</filename>. Files in <filename>/etc/</filename> are
22+
<para>Packages should install their configuration files in <filename>/usr/lib/</filename> (distribution packages)
23+
or <filename>/usr/local/lib/</filename> (local installs). Files in <filename>/etc/</filename> are
2624
reserved for the local administrator, who may use this logic to override the
2725
configuration files installed by vendor packages. All configuration files
2826
are sorted by their filename in lexicographic order, regardless of which of
@@ -52,7 +50,8 @@
5250

5351
<para>When packages need to customize the configuration, they can
5452
install configuration snippets in
55-
<filename>/usr/lib/systemd/*.conf.d/</filename>. Files in
53+
<filename>/usr/lib/systemd/*.conf.d/</filename> or
54+
<filename>/usr/local/lib/systemd/*.conf.d/</filename>. Files in
5655
<filename>/etc/</filename> are reserved for the local
5756
administrator, who may use this logic to override the
5857
configuration files installed by vendor packages. The main

0 commit comments

Comments
 (0)