X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Finitctl.c;h=74eccac557c769ff0f3577033a75b02e5d8b94bc;hp=9d8eceea52ca25df06bc168c11247fe3f7197746;hb=2ee68f721168378a037a112a5400af0b92805432;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221 diff --git a/src/initctl.c b/src/initctl.c index 9d8eceea5..74eccac55 100644 --- a/src/initctl.c +++ b/src/initctl.c @@ -39,8 +39,9 @@ #include "log.h" #include "list.h" #include "initreq.h" -#include "manager.h" +#include "special.h" #include "sd-daemon.h" +#include "dbus-common.h" #define SERVER_FD_MAX 16 #define TIMEOUT ((int) (10*MSEC_PER_SEC)) @@ -72,15 +73,15 @@ static const char *translate_runlevel(int runlevel) { const int runlevel; const char *special; } table[] = { - { '0', SPECIAL_RUNLEVEL0_TARGET }, - { '1', SPECIAL_RUNLEVEL1_TARGET }, - { 's', SPECIAL_RUNLEVEL1_TARGET }, - { 'S', SPECIAL_RUNLEVEL1_TARGET }, + { '0', SPECIAL_POWEROFF_TARGET }, + { '1', SPECIAL_RESCUE_TARGET }, + { 's', SPECIAL_RESCUE_TARGET }, + { 'S', SPECIAL_RESCUE_TARGET }, { '2', SPECIAL_RUNLEVEL2_TARGET }, { '3', SPECIAL_RUNLEVEL3_TARGET }, { '4', SPECIAL_RUNLEVEL4_TARGET }, { '5', SPECIAL_RUNLEVEL5_TARGET }, - { '6', SPECIAL_RUNLEVEL6_TARGET }, + { '6', SPECIAL_REBOOT_TARGET }, }; unsigned i; @@ -96,7 +97,7 @@ static void change_runlevel(Server *s, int runlevel) { const char *target; DBusMessage *m = NULL, *reply = NULL; DBusError error; - const char *path, *replace = "isolate"; + const char *replace = "replace"; assert(s); @@ -109,44 +110,19 @@ static void change_runlevel(Server *s, int runlevel) { log_debug("Running request %s", target); - if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "LoadUnit"))) { + 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_INVALID)) { - log_error("Could not attach group information to signal message."); - goto finish; - } - - if (!(reply = dbus_connection_send_with_reply_and_block(s->bus, m, -1, &error))) { - log_error("Failed to get unit path: %s", error.message); - goto finish; - } - - if (!dbus_message_get_args(reply, &error, - DBUS_TYPE_OBJECT_PATH, &path, - DBUS_TYPE_INVALID)) { - log_error("Failed to parse unit path: %s", error.message); - goto finish; - } - - dbus_message_unref(m); - if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", path, "org.freedesktop.systemd1.Unit", "Start"))) { - log_error("Could not allocate message."); - goto finish; - } - - if (!dbus_message_append_args(m, DBUS_TYPE_STRING, &replace, DBUS_TYPE_INVALID)) { - log_error("Could not attach group information to signal message."); + log_error("Could not attach target and flag information to signal message."); goto finish; } - dbus_message_unref(reply); if (!(reply = dbus_connection_send_with_reply_and_block(s->bus, m, -1, &error))) { log_error("Failed to start unit: %s", error.message); goto finish; @@ -255,8 +231,10 @@ static void server_done(Server *s) { if (s->epoll_fd >= 0) close_nointr_nofail(s->epoll_fd); - if (s->bus) - dbus_connection_unref(s->bus); + if (s->bus) { + dbus_connection_close(s->bus); + dbus_connection_unref(s->bus); + } } static int server_init(Server *s, unsigned n_sockets) { @@ -280,6 +258,20 @@ static int server_init(Server *s, unsigned n_sockets) { for (i = 0; i < n_sockets; i++) { struct epoll_event ev; Fifo *f; + int fd; + + fd = SD_LISTEN_FDS_START+i; + + if ((r = sd_is_fifo(fd, NULL)) < 0) { + log_error("Failed to determine file descriptor type: %s", strerror(-r)); + goto fail; + } + + if (!r) { + log_error("Wrong file descriptor type."); + r = -EINVAL; + goto fail; + } if (!(f = new0(Fifo, 1))) { r = -ENOMEM; @@ -292,20 +284,20 @@ static int server_init(Server *s, unsigned n_sockets) { zero(ev); ev.events = EPOLLIN; ev.data.ptr = f; - if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, SD_LISTEN_FDS_START+i, &ev) < 0) { + 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)); goto fail; } - f->fd = SD_LISTEN_FDS_START+i; + f->fd = fd; LIST_PREPEND(Fifo, fifo, s->fifos, f); f->server = s; s->n_fifos ++; } - if (!(s->bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error))) { + if (bus_connect(DBUS_BUS_SYSTEM, &s->bus, NULL, &error) < 0) { log_error("Failed to get D-Bus connection: %s", error.message); goto fail; } @@ -345,11 +337,19 @@ int main(int argc, char *argv[]) { Server server; int r = 3, n; + if (getppid() != 1) { + log_error("This program should be invoked by init only."); + return 1; + } + + if (argc > 1) { + log_error("This program does not take arguments."); + return 1; + } + log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); log_parse_environment(); - log_info("systemd-initctl running as pid %llu", (unsigned long long) getpid()); - if ((n = sd_listen_fds(true)) < 0) { log_error("Failed to read listening file descriptors from environment: %s", strerror(-r)); return 1; @@ -363,6 +363,12 @@ int main(int argc, char *argv[]) { if (server_init(&server, (unsigned) n) < 0) return 2; + log_debug("systemd-initctl running as pid %lu", (unsigned long) getpid()); + + sd_notify(false, + "READY=1\n" + "STATUS=Processing requests..."); + for (;;) { struct epoll_event event; int k; @@ -384,12 +390,16 @@ int main(int argc, char *argv[]) { if ((k = process_event(&server, &event)) < 0) goto fail; } + r = 0; + log_debug("systemd-initctl stopped as pid %lu", (unsigned long) getpid()); + fail: - server_done(&server); + sd_notify(false, + "STATUS=Shutting down..."); - log_info("systemd-initctl stopped as pid %llu", (unsigned long long) getpid()); + server_done(&server); dbus_shutdown();