X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Flogind.conf.xml;h=0b35f51eb44a6df18edd5644fa92b3df3cab3f53;hb=38ce47e262fbb76b6f6514e8e80cacfc584bee5a;hp=8ba95230bee63a3af4dad1e168574dbd603424a2;hpb=3c56cab44150ad47323970cfadfb0257c6305a74;p=elogind.git
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 8ba95230b..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.
@@ -281,17 +304,17 @@
sleep keys and the lid switch are
subject to inhibitor locks. These
settings take boolean arguments. If
- off, the inhibitor
+ no, the inhibitor
locks taken by applications in order
to block the requested operation are
- respected. If on,
+ respected. If yes,
the requested operation is executed in
any
case. PowerKeyIgnoreInhibited=,
SuspendKeyIgnoreInhibited=
and
HibernateKeyIgnoreInhibited=
- default to off.
+ default to no.
LidSwitchIgnoreInhibited=
defaults to
yes. This means
@@ -332,7 +355,7 @@
when the user fully logs out. Takes a
boolean argument. If enabled, the user
may not consume IPC resources after
- the last of his sessions
+ the last of the user's sessions
terminated. This covers System V
semaphores, shared memory and message
queues, as well as POSIX shared memory