X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-action.c;h=d50f6ebf6d628a799ba1571cdb03182869796595;hp=4091e411b04cfae15faa5794f98cbb1e155be0cc;hb=c2c096d2926572113cba380fde34b119661d45f8;hpb=e8e581bf256b8c0fbd430935af79fa0e8ee570a1 diff --git a/src/login/logind-action.c b/src/login/logind-action.c index 4091e411b..d50f6ebf6 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.c @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** This file is part of systemd. @@ -21,12 +19,25 @@ #include -#include - +#include "alloc-util.h" +#include "bus-error.h" +#include "bus-util.h" #include "conf-parser.h" -#include "special.h" -#include "dbus-common.h" +#include "formats-util.h" #include "logind-action.h" +#include "process-util.h" +#include "sleep-config.h" +//#include "special.h" +#include "string-table.h" +#include "terminal-util.h" +#include "user-util.h" + +/// Additional includes needed by elogind +#include "fd-util.h" +#include "fileio.h" +#include "sd-messages.h" +#include "strv.h" + int manager_handle_action( Manager *m, @@ -45,6 +56,7 @@ int manager_handle_action( [HANDLE_HYBRID_SLEEP] = "Hibernating and suspending..." }; +#if 0 /// elogind does this itself. No target table required static const char * const target_table[_HANDLE_ACTION_MAX] = { [HANDLE_POWEROFF] = SPECIAL_POWEROFF_TARGET, [HANDLE_REBOOT] = SPECIAL_REBOOT_TARGET, @@ -54,44 +66,36 @@ int manager_handle_action( [HANDLE_HIBERNATE] = SPECIAL_HIBERNATE_TARGET, [HANDLE_HYBRID_SLEEP] = SPECIAL_HYBRID_SLEEP_TARGET }; +#endif // 0 - DBusError error; - int r; + _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; InhibitWhat inhibit_operation; + Inhibitor *offending = NULL; bool supported; + int r; assert(m); - if (m->action_what) { - 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."); 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; - else - supported = true; - - if (!supported) { - log_warning("Requested operation not supported, ignoring."); - return -ENOTSUP; + if (inhibit_key == INHIBIT_HANDLE_LID_SWITCH) { + /* 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 (!ignore_inhibited && 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; } @@ -99,35 +103,72 @@ 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; } - inhibit_operation = handle == HANDLE_SUSPEND || handle == HANDLE_HIBERNATE || handle == HANDLE_HYBRID_SLEEP ? INHIBIT_SLEEP : INHIBIT_SHUTDOWN; + if (handle == HANDLE_SUSPEND) + supported = can_sleep(m, "suspend") > 0; + else if (handle == HANDLE_HIBERNATE) + supported = can_sleep(m, "hibernate") > 0; + else if (handle == HANDLE_HYBRID_SLEEP) + supported = can_sleep(m, "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 -EOPNOTSUPP; + } + + if (m->action_what) { + log_debug("Action already in progress, ignoring."); + return -EALREADY; + } + + inhibit_operation = IN_SET(handle, HANDLE_SUSPEND, HANDLE_HIBERNATE, 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 "UID_FMT"/%s, PID "PID_FMT"/%s.", + inhibit_what_to_string(inhibit_operation), + offending->uid, strna(u), + offending->pid, strna(comm)); return 0; } - log_error("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_operation)); - warn_melody(); + log_error("Refusing operation, %s is inhibited by UID "UID_FMT"/%s, PID "PID_FMT"/%s.", + inhibit_what_to_string(inhibit_operation), + offending->uid, strna(u), + offending->pid, strna(comm)); + return -EPERM; } log_info("%s", message_table[handle]); - dbus_error_init(&error); +#if 0 /// elogind uses its own variant, which can use the handle directly. r = bus_manager_shutdown_or_sleep_now_or_later(m, target_table[handle], inhibit_operation, &error); +#else + r = bus_manager_shutdown_or_sleep_now_or_later(m, handle, inhibit_operation, &error); +#endif // 0 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; }