X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Flogind.conf.xml;fp=man%2Flogind.conf.xml;h=0b35f51eb44a6df18edd5644fa92b3df3cab3f53;hp=d37fcba585ee302b780e0ff10d44b166981c4a71;hb=e8461023531de98ac6a49eff9d6ffeff6315249c;hpb=7f0a55d4325f7df91f91b3b818f61f97d78df14a
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index d37fcba58..0b35f51eb 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -44,18 +44,41 @@
logind.conf
- Login manager configuration file
+ Login manager configuration files
/etc/systemd/logind.conf
+ /etc/systemd/logind.conf.d/*.conf
+ /run/systemd/logind.conf.d/*.conf
+ /usr/lib/systemd/logind.conf.d/*.conf
Description
- This file configures various parameters of the systemd login manager, systemd-logind.service8.
-
+ These files configure various parameters of the systemd login manager, systemd-logind.service8.
+
+ Each configuration file shall be named in the style of
+ filename.conf.
+ Files in /etc/ override files with the
+ same name in /usr/lib/ and
+ /run/. Files in
+ /run/ override files with the same name in
+ /usr/lib/. Packages should install their
+ configuration files in /usr/lib/. Files in
+ /etc/ are reserved for the local
+ administrator, who may use this logic to override the
+ configuration files installed by vendor packages. All
+ configuration files are sorted by their filename in
+ lexicographic order, regardless of which of the directories
+ they reside in. If multiple files specify the same option, the
+ entry in the file with the lexicographically latest name will
+ be applied; entries in any logind.conf.d
+ file override entries in
+ /etc/systemd/logind.conf. It is
+ recommended to prefix all filenames with a two-digit number and
+ a dash, to simplify the ordering of the files.