X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-action.c;h=ae7b35055a86b48013870b1a6057655ad7c1cfc2;hb=f39d4a08e746e703d562076a0f622eb91dbdcd3e;hp=e1517d6ac2573d28e045c143eb8538dd4b5d2083;hpb=f274ece0f76b5709408821e317e87aef76123db6;p=elogind.git

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index e1517d6ac..ae7b35055 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -21,9 +21,12 @@
 
 #include <unistd.h>
 
+#include "sd-messages.h"
 #include "conf-parser.h"
 #include "special.h"
-#include "dbus-common.h"
+#include "sleep-config.h"
+#include "bus-util.h"
+#include "bus-error.h"
 #include "logind-action.h"
 
 int manager_handle_action(
@@ -53,10 +56,11 @@ int manager_handle_action(
                 [HANDLE_HYBRID_SLEEP] = SPECIAL_HYBRID_SLEEP_TARGET
         };
 
-        DBusError error;
-        int r;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         InhibitWhat inhibit_operation;
-        bool supported = true;
+        Inhibitor *offending = NULL;
+        bool supported;
+        int r;
 
         assert(m);
 
@@ -66,23 +70,38 @@ int manager_handle_action(
                 return 0;
         }
 
-        if (handle == HANDLE_SUSPEND)
-                supported = can_sleep("mem") > 0;
-        else if (handle == HANDLE_HIBERNATE)
-                supported = can_sleep("disk") > 0;
-        else if (handle == HANDLE_HYBRID_SLEEP)
-                supported = can_sleep("disk") > 0 && can_sleep_disk("suspend") > 0;
-        else if (handle == HANDLE_KEXEC)
-                supported = access("/sbin/kexec", X_OK) >= 0;
+        if (inhibit_key == INHIBIT_HANDLE_LID_SWITCH) {
+                int n;
 
-        if (!supported) {
-                log_warning("Requested operation not supported, ignoring.");
-                return -ENOTSUP;
+                /* If we are docked don't react to lid closing */
+                if (manager_is_docked(m)) {
+                        log_debug("Ignoring lid switch request, system is docked.");
+                        return 0;
+                }
+
+                /* If we have more than one or no displays connected,
+                 * don't react to lid closing. The no display case we
+                 * treat like this under the assumption that there is
+                 * no modern drm driver available. */
+                n = manager_count_displays(m);
+                if (n != 1) {
+                        log_debug("Ignoring lid switch request, %i displays connected.", n);
+                        return 0;
+                }
+
+                /* If the last system suspend or startup is too close,
+                 * let's not suspend for now, to give USB docking
+                 * stations some time to settle so that we can
+                 * properly watch its displays. */
+                if (m->lid_switch_ignore_event_source) {
+                        log_debug("Ignoring lid switch request, system startup or resume too close.");
+                        return 0;
+                }
         }
 
         /* If the key handling is inhibited, don't do anything */
         if (inhibit_key > 0) {
-                if (manager_is_inhibited(m, inhibit_key, INHIBIT_BLOCK, NULL, true, false, 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;
                 }
@@ -90,35 +109,69 @@ int manager_handle_action(
 
         /* Locking is handled differently from the rest. */
         if (handle == HANDLE_LOCK) {
+
+                if (!is_edge)
+                        return 0;
+
                 log_info("Locking sessions...");
                 session_send_lock_all(m, true);
                 return 1;
         }
 
+        if (handle == HANDLE_SUSPEND)
+                supported = can_sleep("suspend") > 0;
+        else if (handle == HANDLE_HIBERNATE)
+                supported = can_sleep("hibernate") > 0;
+        else if (handle == HANDLE_HYBRID_SLEEP)
+                supported = can_sleep("hybrid-sleep") > 0;
+        else if (handle == HANDLE_KEXEC)
+                supported = access(KEXEC, X_OK) >= 0;
+        else
+                supported = true;
+
+        if (!supported) {
+                log_warning("Requested operation not supported, ignoring.");
+                return -ENOTSUP;
+        }
+
+        if (m->action_what) {
+                log_debug("Action already in progress, ignoring.");
+                return -EALREADY;
+        }
+
         inhibit_operation = handle == HANDLE_SUSPEND || handle == HANDLE_HIBERNATE || handle == HANDLE_HYBRID_SLEEP ? INHIBIT_SLEEP : INHIBIT_SHUTDOWN;
 
         /* If the actual operation is inhibited, warn and fail */
         if (!ignore_inhibited &&
-            manager_is_inhibited(m, inhibit_operation, INHIBIT_BLOCK, NULL, false, false, 0)) {
+            manager_is_inhibited(m, inhibit_operation, INHIBIT_BLOCK, NULL, false, false, 0, &offending)) {
+                _cleanup_free_ char *comm = NULL, *u = NULL;
+
+                get_process_comm(offending->pid, &comm);
+                u = uid_to_name(offending->uid);
 
                 /* If this is just a recheck of the lid switch then don't warn about anything */
                 if (!is_edge) {
-                        log_debug("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_operation));
+                        log_debug("Refusing operation, %s is inhibited by UID %lu/%s, PID %lu/%s.",
+                                  inhibit_what_to_string(inhibit_operation),
+                                  (unsigned long) offending->uid, strna(u),
+                                  (unsigned long) offending->pid, strna(comm));
                         return 0;
                 }
 
-                log_error("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_operation));
+                log_error("Refusing operation, %s is inhibited by UID %lu/%s, PID %lu/%s.",
+                          inhibit_what_to_string(inhibit_operation),
+                          (unsigned long) offending->uid, strna(u),
+                          (unsigned long) offending->pid, strna(comm));
+
                 warn_melody();
                 return -EPERM;
         }
 
         log_info("%s", message_table[handle]);
 
-        dbus_error_init(&error);
         r = bus_manager_shutdown_or_sleep_now_or_later(m, target_table[handle], inhibit_operation, &error);
         if (r < 0) {
-                log_error("Failed to execute operation: %s", bus_error_message(&error));
-                dbus_error_free(&error);
+                log_error("Failed to execute operation: %s", bus_error_message(&error, r));
                 return r;
         }