#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))
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;
const char *target;
DBusMessage *m = NULL, *reply = NULL;
DBusError error;
- const char *path, *replace = "isolate";
+ const char *replace = "replace";
assert(s);
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;
if (s->epoll_fd >= 0)
close_nointr_nofail(s->epoll_fd);
- if (s->bus)
- dbus_connection_unref(s->bus);
+ if (s->bus) {
+ dbus_connection_set_exit_on_disconnect(s->bus, FALSE);
+ dbus_connection_unref(s->bus);
+ }
}
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;
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 (!(s->bus = dbus_connection_open("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
log_error("Failed to get D-Bus connection: %s", error.message);
goto fail;
}
+ if ((r = bus_check_peercred(s->bus)) < 0) {
+ log_error("Bus connection failed peer credential check: %s", strerror(-r));
+ goto fail;
+ }
return 0;
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());
+ log_info("systemd-initctl running as pid %lu", (unsigned long) getpid());
if ((n = sd_listen_fds(true)) < 0) {
log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
if (server_init(&server, (unsigned) n) < 0)
return 2;
+ sd_notify(false,
+ "READY=1\n"
+ "STATUS=Processing requests...");
+
for (;;) {
struct epoll_event event;
int k;
r = 0;
fail:
+ sd_notify(false,
+ "STATUS=Shutting down...");
+
server_done(&server);
- log_info("systemd-initctl stopped as pid %llu", (unsigned long long) getpid());
+ log_info("systemd-initctl stopped as pid %lu", (unsigned long) getpid());
dbus_shutdown();