summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-03-03 19:30:16 +0100
committerLennart Poettering <lennart@poettering.net>2014-03-03 19:32:43 +0100
commit6a79c58603ea816a1b4fa1520397b4e138bc1ca0 (patch)
tree2300372efeda7924b759fffeb372b7c414c28b79 /man
parentae833394d64e60edf558dec74c4780d88f788447 (diff)
logind: ignore lid switch if more than 1 display is connected
Previously we expected the desktop environment to take an inhibitor lock, but this opened a race on boot-up where logind might already be running but no DE is active. Hence, let's move checking for additional displays into logind. This also opens up this logic for other DEs, given that only GNOME implemented the inhibitor logic so far.
Diffstat (limited to 'man')
-rw-r--r--man/logind.conf.xml14
1 files changed, 9 insertions, 5 deletions
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 54cc379048..7673201664 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -242,10 +242,10 @@
<literal>ignore</literal>, logind will
never handle these keys. If
<literal>lock</literal>, all running
- sessions will be screen-locked; otherwise,
- the specified action
- will be taken in the respective
- event. Only input devices with the
+ sessions will be screen-locked;
+ otherwise, the specified action will
+ be taken in the respective event. Only
+ input devices with the
<literal>power-switch</literal> udev
tag will be watched for key/lid switch
events. <varname>HandlePowerKey=</varname>
@@ -257,7 +257,11 @@
default to <literal>suspend</literal>.
<varname>HandleHibernateKey=</varname>
defaults to
- <literal>hibernate</literal>.</para></listitem>
+ <literal>hibernate</literal>. Note
+ that the lid switch is ignored if the
+ system is inserted in a docking
+ station, or if more than one display
+ is connected.</para></listitem>
</varlistentry>
<varlistentry>