From af9792ac7f39354f80e9006c42c2400c5e41c447 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 24 Jan 2013 04:56:44 +0100 Subject: logind: only allow one shutdown/sleep action to be queued at the same time This should make sure that closing the lid while shutting down won't suspend the machine but will simply cause the shutdown to complete. --- src/login/logind-action.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/login/logind-action.c') diff --git a/src/login/logind-action.c b/src/login/logind-action.c index e1517d6ac2..a796ebe9ec 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.c @@ -56,10 +56,15 @@ int manager_handle_action( DBusError error; int r; InhibitWhat inhibit_operation; - bool supported = true; + bool supported; assert(m); + if (m->action_job || m->delayed_unit) { + log_debug("Action already in progress, ignoring."); + return -EALREADY; + } + /* If the key handling is turned off, don't do anything */ if (handle == HANDLE_IGNORE) { log_debug("Refusing operation, as it is turned off."); @@ -74,6 +79,8 @@ int manager_handle_action( supported = can_sleep("disk") > 0 && can_sleep_disk("suspend") > 0; else if (handle == HANDLE_KEXEC) supported = access("/sbin/kexec", X_OK) >= 0; + else + supported = true; if (!supported) { log_warning("Requested operation not supported, ignoring."); -- cgit v1.2.3-54-g00ecf