From beaafb2ea6be591882aef21fe19b88e3b2461087 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 19 Sep 2012 13:10:10 +0200 Subject: logind: rework power key/suspend key/lid switch handling http://lists.freedesktop.org/archives/systemd-devel/2012-September/006604.html https://bugzilla.gnome.org/show_bug.cgi?id=680689 This changes the meaning of the HandlePowerKey=/HandleSleepKey=/HandleLidSwitch= setting of logind.conf --- man/logind.conf.xml | 84 +++++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 38 deletions(-) (limited to 'man') diff --git a/man/logind.conf.xml b/man/logind.conf.xml index 304f570b1d..ccfc4abce2 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -204,49 +204,57 @@ 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 - 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 + trigger actions such as system + power-off or suspend. Can be one of + ignore, + poweroff, + reboot, + halt, + kexec and + hibernate. If + ignore logind will + never handle these keys. 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. + HandleSleepKey= and HandleLidSwitch= + default to + suspend. + + + + PowerKeyIgnoreInhibited= + SleepKeyIgnoreInhibited= + 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= + and + SleepKeyIgnoreInhibited= + 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. + -- cgit v1.2.3-54-g00ecf