X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Finitctl%2Finitctl.c;h=468df35bac9eef2920a29715324f87ef002f5270;hp=735f1e145047fa4f368a41c713b1ec93b55ae824;hb=f168c27313e4d7b0aabee037dc9c78a5799f0597;hpb=3143987f93120da696c2d363c34cacf9a82aea93 diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c index 735f1e145..468df35ba 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,53 +106,39 @@ 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) mode = "isolate"; else - mode = "replace"; + mode = "replace-irreversibly"; 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) { @@ -223,12 +210,14 @@ static int fifo_process(Fifo *f) { assert(f); errno = EIO; - if ((l = read(f->fd, ((uint8_t*) &f->buffer) + f->bytes_read, sizeof(f->buffer) - f->bytes_read)) <= 0) { - + l = read(f->fd, + ((uint8_t*) &f->buffer) + f->bytes_read, + sizeof(f->buffer) - f->bytes_read); + if (l <= 0) { if (errno == EAGAIN) return 0; - log_warning("Failed to read from fifo: %s", strerror(errno)); + log_warning("Failed to read from fifo: %m"); return -1; } @@ -249,7 +238,7 @@ static void fifo_free(Fifo *f) { if (f->server) { assert(f->server->n_fifos > 0); f->server->n_fifos--; - LIST_REMOVE(Fifo, fifo, f->server->fifos, f); + LIST_REMOVE(fifo, f->server->fifos, f); } if (f->fd >= 0) { @@ -272,28 +261,24 @@ static void server_done(Server *s) { close_nointr_nofail(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; } @@ -320,8 +305,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; } @@ -333,20 +317,19 @@ 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; } f->fd = fd; - LIST_PREPEND(Fifo, fifo, s->fifos, f); + LIST_PREPEND(fifo, s->fifos, f); f->server = s; 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; } @@ -356,7 +339,6 @@ static int server_init(Server *s, unsigned n_sockets) { fail: server_done(s); - dbus_error_free(&error); return r; } @@ -372,8 +354,8 @@ static int process_event(Server *s, struct epoll_event *ev) { } f = (Fifo*) ev->data.ptr; - - if ((r = fifo_process(f)) < 0) { + r = fifo_process(f); + if (r < 0) { log_info("Got error on fifo: %s", strerror(-r)); fifo_free(f); return r; @@ -432,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; } @@ -453,7 +435,5 @@ fail: server_done(&server); - dbus_shutdown(); - return r; }