X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Flogind.conf.xml;h=df15d51b5f7294a1d96170a5c030f0bb3146d059;hp=304f570b1d5cea669d2470323292f7018d50eff2;hb=20155530437b6b564e60b6b8cf1a69f1bad78c37;hpb=98a77df5fe8591034c48e5d56d903ee268de37f9
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 304f570b1..df15d51b5 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -198,55 +198,74 @@
HandlePowerKey=
- HandleSleepKey=
+ HandleSuspendKey=
+ HandleHibernateKey=
HandleLidSwitch=
Controls whether
logind shall handle the system power
and sleep keys and the lid switch to
- trigger system power-off or
- suspend. Can be one of
- off,
- no-session,
- tty-session,
- any-session and
- always. If
- off logind will
+ trigger actions such as system
+ power-off or suspend. Can be one of
+ ignore,
+ poweroff,
+ reboot,
+ halt,
+ kexec,
+ suspend,
+ hibernate,
+ hybrid-sleep and
+ lock. If
+ ignore logind will
never handle these keys. If
- no-session logind
- will handle these keys when no user is
- logged in and no inhibitor lock is
- taken, and trigger a warning beep
- otherwise. If set to
- tty-session logind
- will handle these keys if no inhibitor
- lock is taken, and either no user is
- logged in or the foreground session is
- a text login and the only one
- existing. If
- any-session is set
- logind will handle these keys if no
- inhibitor lock is taken, and either no
- user is logged in or the foreground
- session is the only one existing
- (regardless whether graphical or
- text). If set to
- always logind will
- handle these keys in any case, even if
- one or more users are logged in or an
- inhibitor lock is taken. Only input
- devices with the
+ lock all running
+ sessions will be screen
+ locked. Otherwise the specified action
+ will be taken in the respective
+ event. Only input devices with the
power-switch udev
- tag will be watched for key
+ tag will be watched for key/lid switch
events. HandlePowerKey=
defaults to
- no-session.
- HandleSleepKey=
- defaults to
- tty-session,
+ poweroff.
+ HandleSuspendKey=
+ and
HandleLidSwitch=
+ default to suspend.
+ HandleHibernateKey=
+ defaults to
+ hibernate.
+
+
+
+ PowerKeyIgnoreInhibited=
+ SuspendKeyIgnoreInhibited=
+ HibernateKeyIgnoreInhibited=
+ LidSwitchIgnoreInhibited=
+
+ Controls whether
+ actions triggered by the power and
+ sleep keys and the lid switch are
+ subject to inhibitor locks. These
+ settings take boolean arguments. If
+ off the inhibitor
+ locks taken by applications in order
+ to block the requested operation are
+ respected, if on
+ the requested operation is executed in
+ any
+ case. PowerKeyIgnoreInhibited=,
+ SuspendKeyIgnoreInhibited=
+ and
+ HibernateKeyIgnoreInhibited=
+ defaults to off,
+ LidSwitchIgnoreInhibited=
defaults to
- off.
+ yes. This means
+ that the lid switch does not respect
+ suspend blockers by default, but the
+ power and sleep keys do.
+