35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 811a90e2de94c71bddf02cdab36c1a0560288695 Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <grawity@gmail.com>
|
||
Date: Mon, 8 Aug 2016 11:07:38 +0300
|
||
Subject: [PATCH] Revert "logind: really handle *KeyIgnoreInhibited options in
|
||
logind.conf"
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
This reverts commit 8121f4d209eca85dcb11830800483cdfafbef9b7.
|
||
|
||
The special 'key handling' inhibitors should always work regardless of
|
||
any *IgnoreInhibited settings – otherwise they're nearly useless.
|
||
|
||
Reverts: #3470
|
||
Fixes: #3897
|
||
(cherry picked from commit 06a70b918d4d753769a727239f75af8896006467)
|
||
---
|
||
src/login/logind-action.c | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
diff --git a/src/login/logind-action.c b/src/login/logind-action.c
|
||
index 8ef48dbaa1..a950409254 100644
|
||
--- a/src/login/logind-action.c
|
||
+++ b/src/login/logind-action.c
|
||
@@ -85,7 +85,7 @@ int manager_handle_action(
|
||
}
|
||
|
||
/* If the key handling is inhibited, don't do anything */
|
||
- if (!ignore_inhibited && inhibit_key > 0) {
|
||
+ if (inhibit_key > 0) {
|
||
if (manager_is_inhibited(m, inhibit_key, INHIBIT_BLOCK, NULL, true, false, 0, NULL)) {
|
||
log_debug("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_key));
|
||
return 0;
|