chiark / gitweb /
Prep v239: Add support for the new 'suspend-then-hibernate' method.
[elogind.git] / src / login / elogind-dbus.c
index 646a4831ccb8a1d7e10c1c263f9175233d384f50..bed5281458ff93d5d7f564c6affba90790eae257 100644 (file)
 ***/
 
 
-#include "bus-common-errors.h"
-#include "bus-error.h"
-#include "bus-util.h"
 #include "elogind-dbus.h"
-#include "fd-util.h"
 #include "process-util.h"
 #include "sd-messages.h"
 #include "sleep.h"
-#include "sleep-config.h"
 #include "string-util.h"
 #include "strv.h"
 #include "update-utmp.h"
-#include "user-util.h"
 
 
 static int bus_manager_log_shutdown(
@@ -81,23 +75,21 @@ static int bus_manager_log_shutdown(
 
 /* elogind specific helper to make HALT and REBOOT possible. */
 static int run_helper(const char *helper) {
-        pid_t pid = 0;
         int   r   = 0;
 
-        r = safe_fork_full(helper, NULL, 0, FORK_RESET_SIGNALS|FORK_DEATHSIG|FORK_CLOSE_ALL_FDS|FORK_WAIT, &pid);
+        r = safe_fork_full(helper, NULL, 0, FORK_RESET_SIGNALS|FORK_REOPEN_LOG, NULL);
 
         if (r < 0)
                 return log_error_errno(errno, "Failed to fork run %s: %m", helper);
 
-        if (pid == 0) {
+        if (0 == r) {
                 /* Child */
-
                 execlp(helper, helper, NULL);
                 log_error_errno(errno, "Failed to execute %s: %m", helper);
                 _exit(EXIT_FAILURE);
         }
 
-        return r;
+        return 0;
 }
 
 /* elogind specific executor */
@@ -115,11 +107,13 @@ static int shutdown_or_sleep(Manager *m, HandleAction action) {
         case HANDLE_KEXEC:
                 return run_helper(KEXEC);
         case HANDLE_SUSPEND:
-                return do_sleep("suspend", m->suspend_mode, m->suspend_state);
+                return do_sleep(m, "suspend");
         case HANDLE_HIBERNATE:
-                return do_sleep("hibernate", m->hibernate_mode, m->hibernate_state);
+                return do_sleep(m, "hibernate");
         case HANDLE_HYBRID_SLEEP:
-                return do_sleep("hybrid-sleep", m->hybrid_sleep_mode, m->hybrid_sleep_state);
+                return do_sleep(m, "hybrid-sleep");
+        case HANDLE_SUSPEND_THEN_HIBERNATE:
+                return do_sleep(m, "suspend-then-hibernate");
         default:
                 return -EINVAL;
         }
@@ -158,7 +152,7 @@ int execute_shutdown_or_sleep(
                 }
 
                  /* This comes from our patched update-utmp/update-utmp.c */
-                update_utmp(2, argv_utmp, m->bus);
+                update_utmp(2, argv_utmp);
                 strv_free(argv_utmp);
         }
 
@@ -186,160 +180,6 @@ int execute_shutdown_or_sleep(
         return 0;
 }
 
-int bus_manager_shutdown_or_sleep_now_or_later(
-                Manager *m,
-                HandleAction action,
-                InhibitWhat w,
-                sd_bus_error *error) {
-
-        bool delayed;
-        int r;
-
-        assert(m);
-        assert(w >= 0);
-        assert(w <= _INHIBIT_WHAT_MAX);
-
-        /* Tell everybody to prepare for shutdown/sleep */
-        (void) send_prepare_for(m, w, true);
-
-        delayed =
-                m->inhibit_delay_max > 0 &&
-                manager_is_inhibited(m, w, INHIBIT_DELAY, NULL, false, false, 0, NULL);
-
-        log_debug_elogind("%s called for %s (%sdelayed)", __FUNCTION__,
-                          handle_action_to_string(action),
-                          delayed ? "" : "NOT ");
-
-        if (delayed)
-                /* Shutdown is delayed, keep in mind what we
-                 * want to do, and start a timeout */
-                r = delay_shutdown_or_sleep(m, w, action);
-        else
-                /* Shutdown is not delayed, execute it
-                 * immediately */
-                r = execute_shutdown_or_sleep(m, w, action, error);
-
-        return r;
-}
-
-static int method_do_shutdown_or_sleep(
-                Manager *m,
-                sd_bus_message *message,
-                HandleAction sleep_action,
-                InhibitWhat w,
-                const char *action,
-                const char *action_multiple_sessions,
-                const char *action_ignore_inhibit,
-                const char *sleep_verb,
-                sd_bus_error *error) {
-
-        int interactive, r;
-
-        assert(m);
-        assert(message);
-        assert(w >= 0);
-        assert(w <= _INHIBIT_WHAT_MAX);
-
-        r = sd_bus_message_read(message, "b", &interactive);
-        if (r < 0)
-                return r;
-
-        log_debug_elogind("%s called with action '%s', sleep '%s' (%sinteractive)",
-                          __FUNCTION__, action, sleep_verb,
-                          interactive ? "" : "NOT ");
-
-        /* Don't allow multiple jobs being executed at the same time */
-        if (m->action_what)
-                return sd_bus_error_setf(error, BUS_ERROR_OPERATION_IN_PROGRESS, "There's already a shutdown or sleep operation in progress");
-
-        if (sleep_verb) {
-                r = can_sleep(m, sleep_verb);
-                if (r < 0)
-                        return r;
-
-                if (r == 0)
-                        return sd_bus_error_setf(error, BUS_ERROR_SLEEP_VERB_NOT_SUPPORTED, "Sleep verb not supported");
-        }
-
-        if (IN_SET(sleep_action, HANDLE_HALT, HANDLE_POWEROFF, HANDLE_REBOOT)) {
-                r = verify_shutdown_creds(m, message, w, interactive, action, action_multiple_sessions,
-                                          action_ignore_inhibit, error);
-                log_debug_elogind("verify_shutdown_creds() returned %d", r);
-                if (r != 0)
-                        return r;
-        }
-
-        r = bus_manager_shutdown_or_sleep_now_or_later(m, sleep_action, w, error);
-        if (r < 0)
-                return r;
-
-        return sd_bus_reply_method_return(message, NULL);
-}
-
-int method_poweroff(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Manager *m = userdata;
-
-        log_debug_elogind("%s called", __FUNCTION__);
-
-        return method_do_shutdown_or_sleep(
-                        m, message,
-                        HANDLE_POWEROFF,
-                        INHIBIT_SHUTDOWN,
-                        "org.freedesktop.login1.power-off",
-                        "org.freedesktop.login1.power-off-multiple-sessions",
-                        "org.freedesktop.login1.power-off-ignore-inhibit",
-                        NULL,
-                        error);
-}
-
-int method_reboot(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Manager *m = userdata;
-
-        log_debug_elogind("%s called", __FUNCTION__);
-
-        return method_do_shutdown_or_sleep(
-                        m, message,
-                        HANDLE_REBOOT,
-                        INHIBIT_SHUTDOWN,
-                        "org.freedesktop.login1.reboot",
-                        "org.freedesktop.login1.reboot-multiple-sessions",
-                        "org.freedesktop.login1.reboot-ignore-inhibit",
-                        NULL,
-                        error);
-}
-
-int method_halt(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Manager *m = userdata;
-
-        log_debug_elogind("%s called", __FUNCTION__);
-
-        return method_do_shutdown_or_sleep(
-                        m, message,
-                        HANDLE_HALT,
-                        INHIBIT_SHUTDOWN,
-                        "org.freedesktop.login1.halt",
-                        "org.freedesktop.login1.halt-multiple-sessions",
-                        "org.freedesktop.login1.halt-ignore-inhibit",
-                        NULL,
-                        error);
-}
-
-int method_suspend(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Manager *m = userdata;
-
-        log_debug_elogind("%s called", __FUNCTION__);
-
-        return method_do_shutdown_or_sleep(
-                        m, message,
-                        HANDLE_SUSPEND,
-                        INHIBIT_SLEEP,
-                        "org.freedesktop.login1.suspend",
-                        "org.freedesktop.login1.suspend-multiple-sessions",
-                        "org.freedesktop.login1.suspend-ignore-inhibit",
-                        "suspend",
-                        error);
-}
-
 int manager_scheduled_shutdown_handler(
                         sd_event_source *s,
                         uint64_t usec,
@@ -396,35 +236,3 @@ error:
         reset_scheduled_shutdown(m);
         return r;
 }
-
-int method_hibernate(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Manager *m = userdata;
-
-        log_debug_elogind("%s called", __FUNCTION__);
-
-        return method_do_shutdown_or_sleep(
-                        m, message,
-                        HANDLE_HIBERNATE,
-                        INHIBIT_SLEEP,
-                        "org.freedesktop.login1.hibernate",
-                        "org.freedesktop.login1.hibernate-multiple-sessions",
-                        "org.freedesktop.login1.hibernate-ignore-inhibit",
-                        "hibernate",
-                        error);
-}
-
-int method_hybrid_sleep(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Manager *m = userdata;
-
-        log_debug_elogind("%s called", __FUNCTION__);
-
-        return method_do_shutdown_or_sleep(
-                        m, message,
-                        HANDLE_HYBRID_SLEEP,
-                        INHIBIT_SLEEP,
-                        "org.freedesktop.login1.hibernate",
-                        "org.freedesktop.login1.hibernate-multiple-sessions",
-                        "org.freedesktop.login1.hibernate-ignore-inhibit",
-                        "hybrid-sleep",
-                        error);
-}