X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Finitctl%2Finitctl.c;h=4c7efa74a302dac7ae6d917e658f5b18b6515955;hb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;hp=f3f6f7304073f44cc9660f35d9d6fef4c9de977d;hpb=82d252404a7ee6bd5f24482a0b50a8e91aa93257;p=elogind.git

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index f3f6f7304..4c7efa74a 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -218,7 +218,7 @@ static int fifo_process(Fifo *f) {
                         return 0;
 
                 log_warning("Failed to read from fifo: %m");
-                return -1;
+                return -errno;
         }
 
         f->bytes_read += l;
@@ -328,7 +328,7 @@ static int server_init(Server *s, unsigned n_sockets) {
 
         r = bus_open_system_systemd(&s->bus);
         if (r < 0) {
-                log_error("Failed to get D-Bus connection: %s", strerror(-r));
+                log_error_errno(-r, "Failed to get D-Bus connection: %m");
                 r = -EIO;
                 goto fail;
         }
@@ -355,7 +355,7 @@ static int process_event(Server *s, struct epoll_event *ev) {
         f = (Fifo*) ev->data.ptr;
         r = fifo_process(f);
         if (r < 0) {
-                log_info("Got error on fifo: %s", strerror(-r));
+                log_info_errno(-r, "Got error on fifo: %m");
                 fifo_free(f);
                 return r;
         }
@@ -385,7 +385,7 @@ int main(int argc, char *argv[]) {
 
         n = sd_listen_fds(true);
         if (n < 0) {
-                log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
+                log_error_errno(-r, "Failed to read listening file descriptors from environment: %m");
                 return EXIT_FAILURE;
         }
 
@@ -431,6 +431,7 @@ int main(int argc, char *argv[]) {
 
 fail:
         sd_notify(false,
+                  "STOPPING=1\n"
                   "STATUS=Shutting down...");
 
         server_done(&server);