diff options
| author | Ronny Chevalier <chevalier.ronny@gmail.com> | 2015-04-10 19:10:00 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 08:01:42 +0100 |
| commit | 901cf821ac8c13c78e1acb884f59baf41316fb8f (patch) | |
| tree | f8b31dce25ba911167540a0aa316feb4147a61a1 /src/login | |
| parent | 9cd66b6bb933e4e307aa9e7cfc664e8916e0a3f0 (diff) | |
shared: add process-util.[ch]
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/inhibit.c | 2 | ||||
| -rw-r--r-- | src/login/loginctl.c | 1 | ||||
| -rw-r--r-- | src/login/logind-action.c | 2 | ||||
| -rw-r--r-- | src/login/logind-dbus.c | 9 |
4 files changed, 14 insertions, 0 deletions
diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 9f349b7c7..57cfb5d0b 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -31,6 +31,8 @@ #include "util.h" #include "build.h" #include "strv.h" +#include "formats-util.h" +#include "process-util.h" static const char* arg_what = "idle:sleep:shutdown"; static const char* arg_who = NULL; diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 16d80ab57..4ca51f676 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -42,6 +42,7 @@ #include "cgroup-util.h" #include "spawn-polkit-agent.h" #include "verbs.h" +#include "process-util.h" static char **arg_property = NULL; static bool arg_all = false; diff --git a/src/login/logind-action.c b/src/login/logind-action.c index d7b1538a3..c83d51d54 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.c @@ -35,6 +35,8 @@ #include "bus-error.h" #include "bus-util.h" #include "logind-action.h" +#include "formats-util.h" +#include "process-util.h" int manager_handle_action( Manager *m, diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index a6cc9be66..7245ee7ab 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -40,6 +40,8 @@ #include "selinux-util.h" #include "efivars.h" #include "logind.h" +#include "formats-util.h" +#include "process-util.h" int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Session **ret) { _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; @@ -1526,6 +1528,7 @@ static int method_do_shutdown_or_sleep( const char *action_multiple_sessions, const char *action_ignore_inhibit, const char *sleep_verb, + sd_bus_message_handler_t method, sd_bus_error *error) { _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; @@ -1540,6 +1543,7 @@ static int method_do_shutdown_or_sleep( assert(action); assert(action_multiple_sessions); assert(action_ignore_inhibit); + assert(method); r = sd_bus_message_read(message, "b", &interactive); if (r < 0) @@ -1615,6 +1619,7 @@ static int method_poweroff(sd_bus *bus, sd_bus_message *message, void *userdata, "org.freedesktop.login1.power-off-multiple-sessions", "org.freedesktop.login1.power-off-ignore-inhibit", NULL, + method_poweroff, error); } @@ -1629,6 +1634,7 @@ static int method_reboot(sd_bus *bus, sd_bus_message *message, void *userdata, s "org.freedesktop.login1.reboot-multiple-sessions", "org.freedesktop.login1.reboot-ignore-inhibit", NULL, + method_reboot, error); } @@ -1643,6 +1649,7 @@ static int method_suspend(sd_bus *bus, sd_bus_message *message, void *userdata, "org.freedesktop.login1.suspend-multiple-sessions", "org.freedesktop.login1.suspend-ignore-inhibit", "suspend", + method_suspend, error); } @@ -1657,6 +1664,7 @@ static int method_hibernate(sd_bus *bus, sd_bus_message *message, void *userdata "org.freedesktop.login1.hibernate-multiple-sessions", "org.freedesktop.login1.hibernate-ignore-inhibit", "hibernate", + method_hibernate, error); } @@ -1671,6 +1679,7 @@ static int method_hybrid_sleep(sd_bus *bus, sd_bus_message *message, void *userd "org.freedesktop.login1.hibernate-multiple-sessions", "org.freedesktop.login1.hibernate-ignore-inhibit", "hybrid-sleep", + method_hybrid_sleep, error); } |