]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
systemctl: conditionalize /dev/initctl fallback on HAVE_SYSV_COMPAT
authorLennart Poettering <lennart@poettering.net>
Thu, 24 Sep 2015 10:33:07 +0000 (12:33 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 29 Sep 2015 19:55:52 +0000 (21:55 +0200)
src/systemctl/systemctl.c

index 804f485403f749dbee4a7125a08dcac3b53af295..c85c5e011b8a4febdfb7eff45d30f0e0a50983a8 100644 (file)
@@ -7118,7 +7118,7 @@ _pure_ static int action_to_runlevel(void) {
 }
 
 static int talk_initctl(void) {
-
+#ifdef HAVE_SYSV_COMPAT
         struct init_request request = {
                 .magic = INIT_MAGIC,
                 .sleeptime  = 0,
@@ -7140,8 +7140,7 @@ static int talk_initctl(void) {
                 if (errno == ENOENT)
                         return 0;
 
-                log_error_errno(errno, "Failed to open "INIT_FIFO": %m");
-                return -errno;
+                return log_error_errno(errno, "Failed to open "INIT_FIFO": %m");
         }
 
         r = loop_write(fd, &request, sizeof(request), false);
@@ -7149,6 +7148,9 @@ static int talk_initctl(void) {
                 return log_error_errno(r, "Failed to write to "INIT_FIFO": %m");
 
         return 1;
+#else
+        return 0;
+#endif
 }
 
 static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) {