#include "initreq.h"
#include "special.h"
#include "sd-daemon.h"
+#include "dbus-common.h"
#define SERVER_FD_MAX 16
#define TIMEOUT ((int) (10*MSEC_PER_SEC))
close_nointr_nofail(s->epoll_fd);
if (s->bus) {
- dbus_connection_set_exit_on_disconnect(s->bus, FALSE);
+ dbus_connection_close(s->bus);
dbus_connection_unref(s->bus);
}
}
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_connection_open("unix:abstract=/org/freedesktop/systemd1/private", &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;
}
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();