summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2023-09-20 10:43:16 +0200
committerGitHub <noreply@github.com>2023-09-20 10:43:16 +0200
commit6d2d38e76f91abb2190623ad0bb0e20609308283 (patch)
tree64a3ad1173007386990701ea5e40fc21c0b46cce /man
parentdocs: various updates to the fdstore docs (diff)
parentReflect the fact that main config files can be installed in /usr (diff)
downloadsystemd-6d2d38e76f91abb2190623ad0bb0e20609308283.tar.xz
systemd-6d2d38e76f91abb2190623ad0bb0e20609308283.zip
Merge pull request #28919 from fbuihuu/custom-config-file-install-path
Custom config file install path
Diffstat (limited to 'man')
-rw-r--r--man/standard-conf.xml15
1 files changed, 9 insertions, 6 deletions
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index f02b9b0594..c4f2877864 100644
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -42,11 +42,12 @@
<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. Initially, the main configuration file in
- <filename>/etc/systemd/</filename> contains commented out entries showing the defaults as a guide to the
- administrator. Local overrides can be created by editing this file or by creating drop-ins, as described
- below. 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 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>
<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>,
@@ -62,7 +63,9 @@
who may use this logic to override the configuration files installed by vendor packages. Drop-ins have to
be used to override package drop-ins, since the main configuration file has lower precedence. It is
recommended to prefix all filenames in those subdirectories with a two-digit number and a dash, to
- simplify the ordering of the files.</para>
+ simplify the ordering of the files. This also defined a concept of drop-in priority to allow
+ distributions to ship drop-ins within a specific range lower than the range used by users. This should
+ lower the risk of package drop-ins overriding accidentally drop-ins defined by users.</para>
<para>To disable a configuration file supplied by the vendor, the recommended way is to place a symlink
to <filename>/dev/null</filename> in the configuration directory in <filename>/etc/</filename>, with the