diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-09-19 13:10:10 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-09-19 13:10:10 +0200 |
| commit | beaafb2ea6be591882aef21fe19b88e3b2461087 (patch) | |
| tree | a61b375510b84f6b43bccfde4bbe0d46372aece5 /src/login/org.freedesktop.login1.policy.in | |
| parent | 468b21de7c9327bb8747d36e6273ed7aed97052a (diff) | |
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
Diffstat (limited to 'src/login/org.freedesktop.login1.policy.in')
| -rw-r--r-- | src/login/org.freedesktop.login1.policy.in | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in index 970adbeff2..8d991e40fb 100644 --- a/src/login/org.freedesktop.login1.policy.in +++ b/src/login/org.freedesktop.login1.policy.in @@ -20,7 +20,17 @@ <_description>Allow applications to inhibit system shutdown</_description> <_message>Authentication is required to allow an application to inhibit system shutdown.</_message> <defaults> - <allow_any>auth_admin_keep</allow_any> + <allow_any>no</allow_any> + <allow_inactive>yes</allow_inactive> + <allow_active>yes</allow_active> + </defaults> + </action> + + <action id="org.freedesktop.login1.inhibit-delay-shutdown"> + <_description>Allow applications to delay system shutdown</_description> + <_message>Authentication is required to allow an application to delay system shutdown.</_message> + <defaults> + <allow_any>yes</allow_any> <allow_inactive>yes</allow_inactive> <allow_active>yes</allow_active> </defaults> @@ -30,7 +40,17 @@ <_description>Allow applications to inhibit system sleep</_description> <_message>Authentication is required to allow an application to inhibit system sleep.</_message> <defaults> - <allow_any>auth_admin_keep</allow_any> + <allow_any>no</allow_any> + <allow_inactive>yes</allow_inactive> + <allow_active>yes</allow_active> + </defaults> + </action> + + <action id="org.freedesktop.login1.inhibit-delay-sleep"> + <_description>Allow applications to delay system sleep</_description> + <_message>Authentication is required to allow an application to delay system sleep.</_message> + <defaults> + <allow_any>yes</allow_any> <allow_inactive>yes</allow_inactive> <allow_active>yes</allow_active> </defaults> @@ -46,31 +66,31 @@ </defaults> </action> - <action id="org.freedesktop.login1.inhibit-delay-shutdown"> - <_description>Allow applications to delay system shutdown</_description> - <_message>Authentication is required to allow an application to delay system shutdown.</_message> + <action id="org.freedesktop.login1.inhibit-handle-power-key"> + <_description>Allow applications to inhibit system handling of the power key</_description> + <_message>Authentication is required to allow an application to inhibit system handling of the power key.</_message> <defaults> - <allow_any>yes</allow_any> + <allow_any>no</allow_any> <allow_inactive>yes</allow_inactive> <allow_active>yes</allow_active> </defaults> </action> - <action id="org.freedesktop.login1.inhibit-delay-sleep"> - <_description>Allow applications to delay system sleep</_description> - <_message>Authentication is required to allow an application to delay system sleep.</_message> + <action id="org.freedesktop.login1.inhibit-handle-sleep-key"> + <_description>Allow applications to inhibit system handling of the sleep key</_description> + <_message>Authentication is required to allow an application to inhibit system handling of the sleep key.</_message> <defaults> - <allow_any>yes</allow_any> + <allow_any>no</allow_any> <allow_inactive>yes</allow_inactive> <allow_active>yes</allow_active> </defaults> </action> - <action id="org.freedesktop.login1.inhibit-delay-idle"> - <_description>Allow applications to delay automatic system suspend</_description> - <_message>Authentication is required to allow an application to delay automatic system suspend.</_message> + <action id="org.freedesktop.login1.inhibit-handle-lid-switch"> + <_description>Allow applications to inhibit system handling of the lid switch</_description> + <_message>Authentication is required to allow an application to inhibit system handling of the lid switch.</_message> <defaults> - <allow_any>yes</allow_any> + <allow_any>no</allow_any> <allow_inactive>yes</allow_inactive> <allow_active>yes</allow_active> </defaults> |