diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-02-22 10:58:48 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-03-07 19:14:36 +0100 |
| commit | b83a59f8a7b621781ff5916bc067b1406374a891 (patch) | |
| tree | cb1be2a061ece0e48a534582b32a396813c7df55 /man/standard-conf.xml | |
| parent | various: use new config loader instead of config_parse_config_file() (diff) | |
| download | systemd-b83a59f8a7b621781ff5916bc067b1406374a891.tar.xz systemd-b83a59f8a7b621781ff5916bc067b1406374a891.zip | |
man: document all the new paths
Diffstat (limited to 'man/standard-conf.xml')
| -rw-r--r-- | man/standard-conf.xml | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/man/standard-conf.xml b/man/standard-conf.xml index c3cebdac5f..f54475f306 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -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 |