From b83a59f8a7b621781ff5916bc067b1406374a891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 22 Feb 2024 10:58:48 +0100 Subject: [PATCH] man: document all the new paths --- man/coredump.conf.xml | 2 ++ man/homed.conf.xml | 2 ++ man/journal-remote.conf.xml | 2 ++ man/journal-upload.conf.xml | 2 ++ man/logind.conf.xml | 2 ++ man/networkd.conf.xml | 2 ++ man/oomd.conf.xml | 3 +++ man/pstore.conf.xml | 12 ++++++++---- man/resolved.conf.xml | 2 ++ man/standard-conf.xml | 19 ++++++++++++------- man/systemd-sleep.conf.xml | 2 ++ man/systemd-system.conf.xml | 11 ++++++++--- man/timesyncd.conf.xml | 2 ++ 13 files changed, 49 insertions(+), 14 deletions(-) diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml index b08d732adb5..29ac35142a3 100644 --- a/man/coredump.conf.xml +++ b/man/coredump.conf.xml @@ -24,6 +24,8 @@ /etc/systemd/coredump.conf + /run/systemd/coredump.conf + /usr/lib/systemd/coredump.conf /etc/systemd/coredump.conf.d/*.conf /run/systemd/coredump.conf.d/*.conf /usr/lib/systemd/coredump.conf.d/*.conf diff --git a/man/homed.conf.xml b/man/homed.conf.xml index a6c070cb532..9dfcfb6296b 100644 --- a/man/homed.conf.xml +++ b/man/homed.conf.xml @@ -24,6 +24,8 @@ /etc/systemd/homed.conf + /run/systemd/homed.conf + /usr/lib/systemd/homed.conf /etc/systemd/homed.conf.d/*.conf /run/systemd/homed.conf.d/*.conf /usr/lib/systemd/homed.conf.d/*.conf diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml index 1cf18c3cd82..44e056ab491 100644 --- a/man/journal-remote.conf.xml +++ b/man/journal-remote.conf.xml @@ -29,6 +29,8 @@ /etc/systemd/journal-remote.conf + /run/systemd/journal-remote.conf + /usr/lib/systemd/journal-remote.conf /etc/systemd/journal-remote.conf.d/*.conf /run/systemd/journal-remote.conf.d/*.conf /usr/lib/systemd/journal-remote.conf.d/*.conf diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml index 66ea0dca6c8..7d3f22f96b4 100644 --- a/man/journal-upload.conf.xml +++ b/man/journal-upload.conf.xml @@ -23,6 +23,8 @@ /etc/systemd/journal-upload.conf + /run/systemd/journal-upload.conf + /usr/lib/systemd/journal-upload.conf /etc/systemd/journal-upload.conf.d/*.conf /run/systemd/journal-upload.conf.d/*.conf /usr/lib/systemd/journal-upload.conf.d/*.conf diff --git a/man/logind.conf.xml b/man/logind.conf.xml index d74c9b410fd..ec160590659 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -27,6 +27,8 @@ /etc/systemd/logind.conf + /run/systemd/logind.conf + /usr/lib/systemd/logind.conf /etc/systemd/logind.conf.d/*.conf /run/systemd/logind.conf.d/*.conf /usr/lib/systemd/logind.conf.d/*.conf diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml index 9477bfe5afd..b5b825b8b8a 100644 --- a/man/networkd.conf.xml +++ b/man/networkd.conf.xml @@ -29,6 +29,8 @@ /etc/systemd/networkd.conf + /run/systemd/networkd.conf + /usr/lib/systemd/networkd.conf /etc/systemd/networkd.conf.d/*.conf /usr/lib/systemd/networkd.conf.d/*.conf diff --git a/man/oomd.conf.xml b/man/oomd.conf.xml index 1c25996498f..b099f8f5461 100644 --- a/man/oomd.conf.xml +++ b/man/oomd.conf.xml @@ -24,7 +24,10 @@ /etc/systemd/oomd.conf + /run/systemd/oomd.conf + /usr/lib/systemd/oomd.conf /etc/systemd/oomd.conf.d/*.conf + /run/systemd/oomd.conf.d/*.conf /usr/lib/systemd/oomd.conf.d/*.conf diff --git a/man/pstore.conf.xml b/man/pstore.conf.xml index 3216a4c27bb..d6b6c4b1d78 100644 --- a/man/pstore.conf.xml +++ b/man/pstore.conf.xml @@ -22,10 +22,14 @@ - - /etc/systemd/pstore.conf - /etc/systemd/pstore.conf.d/* - + + /etc/systemd/pstore.conf + /run/systemd/pstore.conf + /usr/lib/systemd/pstore.conf + /etc/systemd/pstore.conf.d/*.conf + /run/systemd/pstore.conf.d/*.conf + /usr/lib/systemd/pstore.conf.d/*.conf + diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml index 24cf3e427cb..084256cf05d 100644 --- a/man/resolved.conf.xml +++ b/man/resolved.conf.xml @@ -27,6 +27,8 @@ /etc/systemd/resolved.conf + /run/systemd/resolved.conf + /usr/lib/systemd/resolved.conf /etc/systemd/resolved.conf.d/*.conf /run/systemd/resolved.conf.d/*.conf /usr/lib/systemd/resolved.conf.d/*.conf diff --git a/man/standard-conf.xml b/man/standard-conf.xml index c3cebdac5f9..f54475f3066 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -50,14 +50,19 @@ Configuration Directories and Precedence 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 - /usr/lib/systemd/ or /etc/systemd/ 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 /etc/ if it's shipped in /usr/) however using drop-ins for - local configuration is recommended over modifications to the main configuration file. + 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: + /etc/systemd/, + /run/systemd/, + /usr/local/lib/systemd/, + /usr/lib/systemd/. + 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 /etc/ if it's + shipped under /usr/), however using drop-ins for local configuration is recommended + over modifications to the main configuration file. - In addition to the "main" configuration file, drop-in configuration snippets are read from + In addition to the main configuration file, drop-in configuration snippets are read from /usr/lib/systemd/*.conf.d/, /usr/local/lib/systemd/*.conf.d/, and /etc/systemd/*.conf.d/. Those drop-ins have higher precedence and override the main configuration file. Files in the *.conf.d/ configuration subdirectories are diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml index 1abec4f34fd..411577d519c 100644 --- a/man/systemd-sleep.conf.xml +++ b/man/systemd-sleep.conf.xml @@ -24,6 +24,8 @@ /etc/systemd/sleep.conf + /run/systemd/sleep.conf + /usr/lib/systemd/sleep.conf /etc/systemd/sleep.conf.d/*.conf /run/systemd/sleep.conf.d/*.conf /usr/lib/systemd/sleep.conf.d/*.conf diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 31b64213995..e6611d04e7a 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -28,12 +28,16 @@ /etc/systemd/system.conf, + /run/systemd/system.conf, + /usr/lib/systemd/system.conf, /etc/systemd/system.conf.d/*.conf, /run/systemd/system.conf.d/*.conf, /usr/lib/systemd/system.conf.d/*.conf ~/.config/systemd/user.conf, /etc/systemd/user.conf, + /run/systemd/user.conf, + /usr/lib/systemd/user.conf, /etc/systemd/user.conf.d/*.conf, /run/systemd/user.conf.d/*.conf, /usr/lib/systemd/user.conf.d/*.conf @@ -44,9 +48,10 @@ When run as a system instance, systemd interprets the configuration file system.conf and the files in system.conf.d directories; when - run as a user instance, it interprets the configuration file user.conf (either in - the home directory of the user, or if not found, under /etc/systemd/) and the files - in user.conf.d directories. These configuration files contain a few settings + run as a user instance, it interprets the configuration file user.conf (in order of + priority, in the home directory of the user and under /etc/systemd/, + /run/systemd/, and /usr/lib/systemd/) and the files in + user.conf.d directories. These configuration files contain a few settings controlling basic manager operations. See diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml index 498bfa330be..248fd88b773 100644 --- a/man/timesyncd.conf.xml +++ b/man/timesyncd.conf.xml @@ -24,6 +24,8 @@ /etc/systemd/timesyncd.conf + /run/systemd/timesyncd.conf + /usr/lib/systemd/timesyncd.conf /etc/systemd/timesyncd.conf.d/*.conf /run/systemd/timesyncd.conf.d/*.conf /usr/lib/systemd/timesyncd.conf.d/*.conf