system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 10:44:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Reflect the fact that main config files can be installed in /usr

Browse source
This commit is contained in:
Franck Bui 2023-08-21 16:48:42 +02:00
parent 58849483a4
commit c76f2fb0e5
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
man/standard-conf.xml
View file

@ -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

8
src/core/system.conf.in
View file

@ -6,9 +6,11 @@
# any later version.
#
# Entries in this file show the compile time defaults. Local configuration
# should be created by either modifying this file, or by creating "drop-ins" in
# the system.conf.d/ subdirectory. The latter is generally recommended.
# Defaults can be restored by simply deleting this file and all drop-ins.
# should be created by either modifying this file (or a copy of it placed in
# /etc if the original file is shipped in /usr), or by creating "drop-ins" in
# /etc/systemd/system.conf.d/ directory. The latter is generally recommended.
# Defaults can be restored by simply deleting the main configuration file and
# all drop-ins located in /etc.
#
# Use 'systemd-analyze cat-config systemd/system.conf' to display the full config.
#