X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Finitctl.c;h=12b0e894fe6cc33e5d0f56cd9c5e50e9d22f1841;hb=81bf310edce1fccb2720b48fcc5f4bdbd187cd55;hp=e1ab3f7e49ff74afb7f68276f557fbe6ead517a6;hpb=d6c9574fb558d9e304699b1cc7522c3b133adfc9;p=elogind.git diff --git a/src/initctl.c b/src/initctl.c index e1ab3f7e4..12b0e894f 100644 --- a/src/initctl.c +++ b/src/initctl.c @@ -119,12 +119,12 @@ static void change_runlevel(Server *s, int runlevel) { DBUS_TYPE_STRING, &target, DBUS_TYPE_STRING, &replace, DBUS_TYPE_INVALID)) { - log_error("Could not attach target and flag information to signal message."); + 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", error.message); + log_error("Failed to start unit: %s", bus_error_message(&error)); goto finish; } @@ -298,7 +298,7 @@ static int server_init(Server *s, unsigned n_sockets) { } if (bus_connect(DBUS_BUS_SYSTEM, &s->bus, NULL, &error) < 0) { - log_error("Failed to get D-Bus connection: %s", error.message); + log_error("Failed to get D-Bus connection: %s", bus_error_message(&error)); goto fail; } @@ -349,6 +349,7 @@ int main(int argc, char *argv[]) { log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); log_parse_environment(); + log_open(); if ((n = sd_listen_fds(true)) < 0) { log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));