X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Finitctl%2Finitctl.c;h=0954e58afdb1f260809054b2557f274233b0d7e2;hb=58d617429dcfb6fb1ea0f7b6cbce82266ccbb1aa;hp=d5411bde2fe47344e75b5c52fe89a91c6afa3291;hpb=71fda00f320379f5cbee8e118848de98caaa229d;p=elogind.git diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c index d5411bde2..0954e58af 100644 --- a/src/initctl/initctl.c +++ b/src/initctl/initctl.c @@ -33,15 +33,16 @@ #include #include -#include -#include +#include "sd-daemon.h" +#include "sd-bus.h" #include "util.h" #include "log.h" #include "list.h" #include "initreq.h" #include "special.h" -#include "dbus-common.h" +#include "bus-util.h" +#include "bus-error.h" #include "def.h" #define SERVER_FD_MAX 16 @@ -55,7 +56,7 @@ typedef struct Server { LIST_HEAD(Fifo, fifos); unsigned n_fifos; - DBusConnection *bus; + sd_bus *bus; bool quit; } Server; @@ -105,18 +106,17 @@ static const char *translate_runlevel(int runlevel, bool *isolate) { static void change_runlevel(Server *s, int runlevel) { const char *target; - DBusMessage *m = NULL, *reply = NULL; - DBusError error; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; const char *mode; bool isolate = false; + int r; assert(s); - dbus_error_init(&error); - - if (!(target = translate_runlevel(runlevel, &isolate))) { + target = translate_runlevel(runlevel, &isolate); + if (!target) { log_warning("Got request for unknown runlevel %c, ignoring.", runlevel); - goto finish; + return; } if (isolate) @@ -126,32 +126,19 @@ static void change_runlevel(Server *s, int runlevel) { log_debug("Running request %s/start/%s", target, mode); - if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"))) { - log_error("Could not allocate message."); - goto finish; - } - - if (!dbus_message_append_args(m, - DBUS_TYPE_STRING, &target, - DBUS_TYPE_STRING, &mode, - DBUS_TYPE_INVALID)) { - log_error("Could not attach target and flag information to message."); - goto finish; - } - - if (!(reply = dbus_connection_send_with_reply_and_block(s->bus, m, -1, &error))) { - log_error("Failed to start unit: %s", bus_error_message(&error)); - goto finish; + r = sd_bus_call_method( + s->bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "StartUnit", + &error, + NULL, + "ss", target, mode); + if (r < 0) { + log_error("Failed to change runlevel: %s", bus_error_message(&error, -r)); + return; } - -finish: - if (m) - dbus_message_unref(m); - - if (reply) - dbus_message_unref(reply); - - dbus_error_free(&error); } static void request_process(Server *s, const struct init_request *req) { @@ -230,8 +217,8 @@ static int fifo_process(Fifo *f) { if (errno == EAGAIN) return 0; - log_warning("Failed to read from fifo: %s", strerror(errno)); - return -1; + log_warning("Failed to read from fifo: %m"); + return -errno; } f->bytes_read += l; @@ -258,7 +245,7 @@ static void fifo_free(Fifo *f) { if (f->server) epoll_ctl(f->server->epoll_fd, EPOLL_CTL_DEL, f->fd, NULL); - close_nointr_nofail(f->fd); + safe_close(f->fd); } free(f); @@ -270,32 +257,27 @@ static void server_done(Server *s) { while (s->fifos) fifo_free(s->fifos); - if (s->epoll_fd >= 0) - close_nointr_nofail(s->epoll_fd); + safe_close(s->epoll_fd); if (s->bus) { - dbus_connection_flush(s->bus); - dbus_connection_close(s->bus); - dbus_connection_unref(s->bus); + sd_bus_flush(s->bus); + sd_bus_unref(s->bus); } } static int server_init(Server *s, unsigned n_sockets) { int r; unsigned i; - DBusError error; assert(s); assert(n_sockets > 0); - dbus_error_init(&error); - zero(*s); s->epoll_fd = epoll_create1(EPOLL_CLOEXEC); if (s->epoll_fd < 0) { r = -errno; - log_error("Failed to create epoll object: %s", strerror(errno)); + log_error("Failed to create epoll object: %m"); goto fail; } @@ -322,8 +304,7 @@ static int server_init(Server *s, unsigned n_sockets) { f = new0(Fifo, 1); if (!f) { r = -ENOMEM; - log_error("Failed to create fifo object: %s", - strerror(errno)); + log_error("Failed to create fifo object: %m"); goto fail; } @@ -335,8 +316,7 @@ static int server_init(Server *s, unsigned n_sockets) { if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) { r = -errno; fifo_free(f); - log_error("Failed to add fifo fd to epoll object: %s", - strerror(errno)); + log_error("Failed to add fifo fd to epoll object: %m"); goto fail; } @@ -346,9 +326,9 @@ static int server_init(Server *s, unsigned n_sockets) { s->n_fifos ++; } - if (bus_connect(DBUS_BUS_SYSTEM, &s->bus, NULL, &error) < 0) { - log_error("Failed to get D-Bus connection: %s", - bus_error_message(&error)); + r = bus_open_system_systemd(&s->bus); + if (r < 0) { + log_error("Failed to get D-Bus connection: %s", strerror(-r)); r = -EIO; goto fail; } @@ -358,7 +338,6 @@ static int server_init(Server *s, unsigned n_sockets) { fail: server_done(s); - dbus_error_free(&error); return r; } @@ -404,7 +383,8 @@ int main(int argc, char *argv[]) { umask(0022); - if ((n = sd_listen_fds(true)) < 0) { + n = sd_listen_fds(true); + if (n < 0) { log_error("Failed to read listening file descriptors from environment: %s", strerror(-r)); return EXIT_FAILURE; } @@ -417,7 +397,7 @@ int main(int argc, char *argv[]) { if (server_init(&server, (unsigned) n) < 0) return EXIT_FAILURE; - log_debug("systemd-initctl running as pid %lu", (unsigned long) getpid()); + log_debug("systemd-initctl running as pid "PID_FMT, getpid()); sd_notify(false, "READY=1\n" @@ -434,7 +414,7 @@ int main(int argc, char *argv[]) { if (errno == EINTR) continue; - log_error("epoll_wait() failed: %s", strerror(errno)); + log_error("epoll_wait() failed: %m"); goto fail; } @@ -447,7 +427,7 @@ int main(int argc, char *argv[]) { r = EXIT_SUCCESS; - log_debug("systemd-initctl stopped as pid %lu", (unsigned long) getpid()); + log_debug("systemd-initctl stopped as pid "PID_FMT, getpid()); fail: sd_notify(false, @@ -455,7 +435,5 @@ fail: server_done(&server); - dbus_shutdown(); - return r; }