diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-03-08 08:25:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-08 08:25:07 +0100 |
| commit | ec596fe34e731fa8c1772b8c1e3a7762be0f4665 (patch) | |
| tree | 33fe53d931e3f5fa74fc1e054226945b90fbb907 /man/systemd-system.conf.xml | |
| parent | resolved: don't cache NXDOMAIN for SUDN resolver.arpa (diff) | |
| parent | shared/conf-parser: add two more annotations (diff) | |
| download | systemd-ec596fe34e731fa8c1772b8c1e3a7762be0f4665.tar.xz systemd-ec596fe34e731fa8c1772b8c1e3a7762be0f4665.zip | |
Merge pull request #30480 from keszybz/kernel-install-more-paths
Read kernel-install config from /run/kernel too
Diffstat (limited to 'man/systemd-system.conf.xml')
| -rw-r--r-- | man/systemd-system.conf.xml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 31b6421399..e6611d04e7 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -28,12 +28,16 @@ <refsynopsisdiv> <para><filename>/etc/systemd/system.conf</filename>, + <filename>/run/systemd/system.conf</filename>, + <filename>/usr/lib/systemd/system.conf</filename>, <filename>/etc/systemd/system.conf.d/*.conf</filename>, <filename>/run/systemd/system.conf.d/*.conf</filename>, <filename>/usr/lib/systemd/system.conf.d/*.conf</filename></para> <para><filename>~/.config/systemd/user.conf</filename>, <filename>/etc/systemd/user.conf</filename>, + <filename>/run/systemd/user.conf</filename>, + <filename>/usr/lib/systemd/user.conf</filename>, <filename>/etc/systemd/user.conf.d/*.conf</filename>, <filename>/run/systemd/user.conf.d/*.conf</filename>, <filename>/usr/lib/systemd/user.conf.d/*.conf</filename></para> @@ -44,9 +48,10 @@ <para>When run as a system instance, <command>systemd</command> interprets the configuration file <filename>system.conf</filename> and the files in <filename>system.conf.d</filename> directories; when - run as a user instance, it interprets the configuration file <filename>user.conf</filename> (either in - the home directory of the user, or if not found, under <filename>/etc/systemd/</filename>) and the files - in <filename>user.conf.d</filename> directories. These configuration files contain a few settings + run as a user instance, it interprets the configuration file <filename>user.conf</filename> (in order of + priority, in the home directory of the user and under <filename>/etc/systemd/</filename>, + <filename>/run/systemd/</filename>, and <filename>/usr/lib/systemd/</filename>) and the files in + <filename>user.conf.d</filename> directories. These configuration files contain a few settings controlling basic manager operations.</para> <para>See |