X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-action.c;h=4070405190724bb8030d97c8651420c440cce4b3;hb=25f5ed9554af221f8d9dff3689bee51920a4e3ed;hp=da5a8305fa9af4f1ec248e0fadaa4e086c09a2c5;hpb=6a79c58603ea816a1b4fa1520397b4e138bc1ca0;p=elogind.git diff --git a/src/login/logind-action.c b/src/login/logind-action.c index da5a8305f..407040519 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,13 +19,25 @@ #include -#include "sd-messages.h" -#include "conf-parser.h" -#include "special.h" -#include "sleep-config.h" -#include "bus-util.h" +#include "alloc-util.h" #include "bus-error.h" +#include "bus-util.h" +#include "conf-parser.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, @@ -46,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, @@ -55,8 +66,9 @@ int manager_handle_action( [HANDLE_HIBERNATE] = SPECIAL_HIBERNATE_TARGET, [HANDLE_HYBRID_SLEEP] = SPECIAL_HYBRID_SLEEP_TARGET }; +#endif // 0 - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; InhibitWhat inhibit_operation; Inhibitor *offending = NULL; bool supported; @@ -70,18 +82,13 @@ int manager_handle_action( return 0; } - /* If we are docked don't react to lid closing */ if (inhibit_key == INHIBIT_HANDLE_LID_SWITCH) { - int n; - - if (manager_is_docked(m)) { - log_debug("Ignoring lid switch request, system is docked."); - return 0; - } - - n = manager_count_displays(m); - if (n != 1) { - log_debug("Ignoring lid switch request, %s displays connected."); + /* 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; } } @@ -106,11 +113,11 @@ int manager_handle_action( } if (handle == HANDLE_SUSPEND) - supported = can_sleep("suspend") > 0; + supported = can_sleep(m, "suspend") > 0; else if (handle == HANDLE_HIBERNATE) - supported = can_sleep("hibernate") > 0; + supported = can_sleep(m, "hibernate") > 0; else if (handle == HANDLE_HYBRID_SLEEP) - supported = can_sleep("hybrid-sleep") > 0; + supported = can_sleep(m, "hybrid-sleep") > 0; else if (handle == HANDLE_KEXEC) supported = access(KEXEC, X_OK) >= 0; else @@ -118,7 +125,7 @@ int manager_handle_action( if (!supported) { log_warning("Requested operation not supported, ignoring."); - return -ENOTSUP; + return -EOPNOTSUPP; } if (m->action_what) { @@ -138,25 +145,28 @@ int manager_handle_action( /* 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 by UID %lu/%s, PID %lu/%s.", + log_debug("Refusing operation, %s is inhibited by UID "UID_FMT"/%s, PID "PID_FMT"/%s.", inhibit_what_to_string(inhibit_operation), - (unsigned long) offending->uid, strna(u), - (unsigned long) offending->pid, strna(comm)); + offending->uid, strna(u), + offending->pid, strna(comm)); return 0; } - log_error("Refusing operation, %s is inhibited by UID %lu/%s, PID %lu/%s.", + log_error("Refusing operation, %s is inhibited by UID "UID_FMT"/%s, PID "PID_FMT"/%s.", inhibit_what_to_string(inhibit_operation), - (unsigned long) offending->uid, strna(u), - (unsigned long) offending->pid, strna(comm)); + offending->uid, strna(u), + offending->pid, strna(comm)); - warn_melody(); return -EPERM; } log_info("%s", message_table[handle]); +#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, r)); return r; @@ -165,6 +175,49 @@ int manager_handle_action( return 1; } +static int run_helper(const char *helper) { + int pid = fork(); + if (pid < 0) { + return log_error_errno(errno, "Failed to fork: %m"); + } + + if (pid == 0) { + /* Child */ + + close_all_fds(NULL, 0); + + execlp(helper, helper, NULL); + log_error_errno(errno, "Failed to execute %s: %m", helper); + _exit(EXIT_FAILURE); + } + + return wait_for_terminate_and_warn(helper, pid, true); +} + +int shutdown_or_sleep(Manager *m, HandleAction action) { + + assert(m); + + switch (action) { + case HANDLE_POWEROFF: + return run_helper(HALT); + case HANDLE_REBOOT: + return run_helper(REBOOT); + case HANDLE_HALT: + return run_helper(HALT); + case HANDLE_KEXEC: + return run_helper(KEXEC); + case HANDLE_SUSPEND: + return do_sleep("suspend", m->suspend_mode, m->suspend_state); + case HANDLE_HIBERNATE: + return do_sleep("hibernate", m->hibernate_mode, m->hibernate_state); + case HANDLE_HYBRID_SLEEP: + return do_sleep("hybrid-sleep", m->hybrid_sleep_mode, m->hybrid_sleep_state); + default: + return -EINVAL; + } +} + static const char* const handle_action_table[_HANDLE_ACTION_MAX] = { [HANDLE_IGNORE] = "ignore", [HANDLE_POWEROFF] = "poweroff",