systemctl: rework exit codes for all utility programs to follow LSB or other standards

diff --git a/fixme b/fixme
index 38f92a4c2cc2f3cda39040dd84b6486a9d744fef..58fb81e772f589bbd2f743acbc809e82988fd3bc 100644 (file)
--- a/fixme
+++ b/fixme
@@ -78,11 +78,7 @@ v9:
 
 * MTA IS KAPUTT
 
-* kill-mode=cgroup muss auch die mainpid killen! https://bugzilla.redhat.com/show_bug.cgi?id=626477
-
-* follow LSB exit codes spec in "systemctl start"
-
-* systemctl wrapping https://bugzilla.redhat.com/show_bug.cgi?id=626891 https://bugzilla.redhat.com/show_bug.cgi?id=626443
+* fix terminal setup
 
 External:
 

diff --git a/src/cgls.c b/src/cgls.c
index f1f3046edfd1897d2709c43c734ed3a5349f8e54..93617ddc2fa6b77ad0df97c2bea4e57b1da416b1 100644 (file)
--- a/src/cgls.c
+++ b/src/cgls.c
@@ -72,7 +72,7 @@ static int parse_argv(int argc, char *argv[]) {
 }
 
 int main(int argc, char *argv[]) {
-        int r = 0, retval = 1;
+        int r = 0, retval = EXIT_FAILURE;
 
         log_parse_environment();
         log_open();
@@ -80,7 +80,7 @@ int main(int argc, char *argv[]) {
         if ((r = parse_argv(argc, argv)) < 0)
                 goto finish;
         else if (r == 0) {
-                retval = 0;
+                retval = EXIT_SUCCESS;
                 goto finish;
         }
 
@@ -115,7 +115,7 @@ int main(int argc, char *argv[]) {
         if (r < 0)
                 log_error("Failed to list cgroup tree: %s", strerror(-r));
 
-        retval = 0;
+        retval = EXIT_SUCCESS;
 
 finish:
 

diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index af458b25e49963c154b7f78accee9e24504e6fc5..6f7a857eaf9a74fa791d6a4ff6e3080a0b775da9 100644 (file)
--- a/src/cgroups-agent.c
+++ b/src/cgroups-agent.c
@@ -21,6 +21,8 @@
 
 #include <dbus/dbus.h>
 
+#include <stdlib.h>
+
 #include "log.h"
 #include "dbus-common.h"
 
@@ -28,7 +30,7 @@ int main(int argc, char *argv[]) {
         DBusError error;
         DBusConnection *bus = NULL;
         DBusMessage *m = NULL;
-        int r = 1;
+        int r = EXIT_FAILURE;
 
         dbus_error_init(&error);
 
@@ -76,7 +78,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        r = 0;
+        r = EXIT_SUCCESS;
 
 finish:
         if (bus) {

diff --git a/src/initctl.c b/src/initctl.c
index 12b0e894fe6cc33e5d0f56cd9c5e50e9d22f1841..6c3ec0264780a16b8184cfbe95b8ba424a84c818 100644 (file)
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -335,16 +335,16 @@ static int process_event(Server *s, struct epoll_event *ev) {
 
 int main(int argc, char *argv[]) {
         Server server;
-        int r = 3, n;
+        int r = EXIT_FAILURE, n;
 
         if (getppid() != 1) {
                 log_error("This program should be invoked by init only.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         if (argc > 1) {
                 log_error("This program does not take arguments.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
@@ -353,16 +353,16 @@ int main(int argc, char *argv[]) {
 
         if ((n = sd_listen_fds(true)) < 0) {
                 log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
-                return 1;
+                return EXIT_FAILURE;
         }
 
         if (n <= 0 || n > SERVER_FD_MAX) {
                 log_error("No or too many file descriptors passed.");
-                return 2;
+                return EXIT_FAILURE;
         }
 
         if (server_init(&server, (unsigned) n) < 0)
-                return 2;
+                return EXIT_FAILURE;
 
         log_debug("systemd-initctl running as pid %lu", (unsigned long) getpid());
 
@@ -392,7 +392,7 @@ int main(int argc, char *argv[]) {
                         goto fail;
         }
 
-        r = 0;
+        r = EXIT_SUCCESS;
 
         log_debug("systemd-initctl stopped as pid %lu", (unsigned long) getpid());
 

diff --git a/src/kmsg-syslogd.c b/src/kmsg-syslogd.c
index f5c8e7121d19a7a48fdf5aa1420a85519e0643ee..2bdbb4b9f347f0e444030709f05bdfe95c76be51 100644 (file)
--- a/src/kmsg-syslogd.c
+++ b/src/kmsg-syslogd.c
@@ -473,16 +473,16 @@ static int process_event(Server *s, struct epoll_event *ev) {
 
 int main(int argc, char *argv[]) {
         Server server;
-        int r = 3, n;
+        int r = EXIT_FAILURE, n;
 
         if (getppid() != 1) {
                 log_error("This program should be invoked by init only.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         if (argc > 1) {
                 log_error("This program does not take arguments.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         log_set_target(LOG_TARGET_KMSG);
@@ -491,16 +491,16 @@ int main(int argc, char *argv[]) {
 
         if ((n = sd_listen_fds(true)) < 0) {
                 log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
-                return 1;
+                return EXIT_FAILURE;
         }
 
         if (n <= 0 || n > SERVER_FD_MAX) {
                 log_error("No or too many file descriptors passed.");
-                return 2;
+                return EXIT_FAILURE;
         }
 
         if (server_init(&server, (unsigned) n) < 0)
-                return 3;
+                return EXIT_FAILURE;
 
         log_debug("systemd-kmsg-syslogd running as pid %lu", (unsigned long) getpid());
 
@@ -531,7 +531,7 @@ int main(int argc, char *argv[]) {
                         break;
         }
 
-        r = 0;
+        r = EXIT_SUCCESS;
 
         log_debug("systemd-kmsg-syslogd stopped as pid %lu", (unsigned long) getpid());
 

diff --git a/src/logger.c b/src/logger.c
index 5a28c2197fd3c0d9a36f604e453e5afe8e6b31e6..a590bb84fdd1aa39e63acd4affbf82ddce40e6ed 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -557,16 +557,16 @@ static int process_event(Server *s, struct epoll_event *ev) {
 
 int main(int argc, char *argv[]) {
         Server server;
-        int r = 3, n;
+        int r = EXIT_FAILURE, n;
 
         if (getppid() != 1) {
                 log_error("This program should be invoked by init only.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         if (argc > 1) {
                 log_error("This program does not take arguments.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
@@ -575,16 +575,16 @@ int main(int argc, char *argv[]) {
 
         if ((n = sd_listen_fds(true)) < 0) {
                 log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
-                return 1;
+                return EXIT_FAILURE;
         }
 
         if (n <= 0 || n > SERVER_FD_MAX) {
                 log_error("No or too many file descriptors passed.");
-                return 2;
+                return EXIT_FAILURE;
         }
 
         if (server_init(&server, (unsigned) n) < 0)
-                return 3;
+                return EXIT_FAILURE;
 
         log_debug("systemd-logger running as pid %lu", (unsigned long) getpid());
 
@@ -614,7 +614,7 @@ int main(int argc, char *argv[]) {
                         goto fail;
         }
 
-        r = 0;
+        r = EXIT_SUCCESS;
 
         log_debug("systemd-logger stopped as pid %lu", (unsigned long) getpid());
 

diff --git a/src/main.c b/src/main.c
index 53a455b5059fb3413ab9767a373b58379e487a1e..2e6ccfaa30d37f3e7a74234f4722cb296a150b66 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -876,7 +876,7 @@ fail:
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;
-        int r, retval = 1;
+        int r, retval = EXIT_FAILURE;
         FDSet *fds = NULL;
         bool reexecute = false;
 
@@ -937,10 +937,10 @@ int main(int argc, char *argv[]) {
                 goto finish;
         } else if (arg_action == ACTION_DUMP_CONFIGURATION_ITEMS) {
                 unit_dump_config_items(stdout);
-                retval = 0;
+                retval = EXIT_SUCCESS;
                 goto finish;
         } else if (arg_action == ACTION_DONE) {
-                retval = 0;
+                retval = EXIT_SUCCESS;
                 goto finish;
         }
 
@@ -1072,7 +1072,7 @@ int main(int argc, char *argv[]) {
                 if (arg_action == ACTION_TEST) {
                         printf("-> By jobs:\n");
                         manager_dump_jobs(m, stdout, "\t");
-                        retval = 0;
+                        retval = EXIT_SUCCESS;
                         goto finish;
                 }
         }
@@ -1086,7 +1086,7 @@ int main(int argc, char *argv[]) {
                 switch (m->exit_code) {
 
                 case MANAGER_EXIT:
-                        retval = 0;
+                        retval = EXIT_SUCCESS;
                         log_debug("Exit.");
                         goto finish;
 

diff --git a/src/modules-load.c b/src/modules-load.c
index 44ff02e7b83c46518008a7c49899ddf029a1bc59..bfe5b8a995e3f9f866a10f162374acfcb5258db6 100644 (file)
--- a/src/modules-load.c
+++ b/src/modules-load.c
@@ -51,13 +51,13 @@ static int scandir_filter(const struct dirent *d) {
 
 int main(int argc, char *argv[]) {
         struct dirent **de = NULL;
-        int r = 1, n, i;
+        int r = EXIT_FAILURE, n, i;
         char **arguments = NULL;
         unsigned n_arguments = 0, n_allocated = 0;
 
         if (argc > 1) {
                 log_error("This program takes no argument.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
@@ -74,14 +74,14 @@ int main(int argc, char *argv[]) {
         if ((n = scandir("/etc/modules.d/", &de, scandir_filter, alphasort)) < 0) {
 
                 if (errno == ENOENT)
-                        r = 0;
+                        r = EXIT_SUCCESS;
                 else
                         log_error("Failed to enumerate /etc/modules.d/ files: %m");
 
                 goto finish;
         }
 
-        r = 0;
+        r = EXIT_SUCCESS;
 
         for (i = 0; i < n; i++) {
                 int k;
@@ -93,7 +93,7 @@ int main(int argc, char *argv[]) {
 
                 if (k < 0) {
                         log_error("Failed to allocate file name.");
-                        r = 1;
+                        r = EXIT_FAILURE;
                         continue;
                 }
 
@@ -102,7 +102,7 @@ int main(int argc, char *argv[]) {
 
                 if (!f) {
                         log_error("Failed to open %s: %m", fn);
-                        r = 1;
+                        r = EXIT_FAILURE;
                         continue;
                 }
 
@@ -130,7 +130,7 @@ int main(int argc, char *argv[]) {
                                 if (!(a = realloc(arguments, sizeof(char*) * (m+1)))) {
                                         log_error("Failed to increase module array size.");
                                         free(t);
-                                        r = 1;
+                                        r = EXIT_FAILURE;
                                         continue;
                                 }
 
@@ -142,7 +142,7 @@ int main(int argc, char *argv[]) {
                 }
 
                 if (ferror(f)) {
-                        r = 1;
+                        r = EXIT_FAILURE;
                         log_error("Failed to read from file: %m");
                 }
 
@@ -158,7 +158,7 @@ finish:
                 execv("/sbin/modprobe", arguments);
 
                 log_error("Failed to execute /sbin/modprobe: %m");
-                r = 1;
+                r = EXIT_FAILURE;
         }
 
         strv_free(arguments);

diff --git a/src/notify.c b/src/notify.c
index 1c18c6bc0805c449f190e4c89980e637cd45fde7..28cfe23b23c4d81ddeaee10ba4b07366fc44abd9 100644 (file)
--- a/src/notify.c
+++ b/src/notify.c
@@ -131,13 +131,13 @@ int main(int argc, char* argv[]) {
         char* our_env[4], **final_env = NULL;
         unsigned i = 0;
         char *status = NULL, *cpid = NULL, *n = NULL;
-        int r, retval = 1;
+        int r, retval = EXIT_FAILURE;
 
         log_parse_environment();
         log_open();
 
         if ((r = parse_argv(argc, argv)) <= 0) {
-                retval = r < 0;
+                retval = r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
                 goto finish;
         }
 
@@ -173,7 +173,7 @@ int main(int argc, char* argv[]) {
         }
 
         if (strv_length(final_env) <= 0) {
-                retval = 0;
+                retval = EXIT_SUCCESS;
                 goto finish;
         }
 
@@ -187,7 +187,7 @@ int main(int argc, char* argv[]) {
                 goto finish;
         }
 
-        retval = r <= 0;
+        retval = r <= 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 
 finish:
         free(status);

diff --git a/src/random-seed.c b/src/random-seed.c
index 586c69837b337dc39e85f40b7e0ff5eeb56f1f2e..936ed4791b91548d573330fbe9997be32da21536 100644 (file)
--- a/src/random-seed.c
+++ b/src/random-seed.c
@@ -32,7 +32,7 @@
 
 int main(int argc, char *argv[]) {
         int seed_fd = -1, random_fd = -1;
-        int ret = 1;
+        int ret = EXIT_FAILURE;
         void* buf;
         size_t buf_size = 0;
         ssize_t r;
@@ -40,7 +40,7 @@ int main(int argc, char *argv[]) {
 
         if (argc != 2) {
                 log_error("This program requires one argument.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
@@ -119,7 +119,7 @@ int main(int argc, char *argv[]) {
                         log_error("Failed to write new random seed file: %s", r < 0 ? strerror(errno) : "short write");
         }
 
-        ret = 0;
+        ret = EXIT_SUCCESS;
 
 finish:
         if (random_fd >= 0)

diff --git a/src/remount-api-vfs.c b/src/remount-api-vfs.c
index d51a584f2f7ad24aeac52633bd6f06f36a959452..8cdf7e875882009b771f3a5adcbdb68a0e27e406 100644 (file)
--- a/src/remount-api-vfs.c
+++ b/src/remount-api-vfs.c
@@ -37,14 +37,14 @@
  * respected */
 
 int main(int argc, char *argv[]) {
-        int ret = 1;
+        int ret = EXIT_FAILURE;
         FILE *f = NULL;
         struct mntent* me;
         Hashmap *pids = NULL;
 
         if (argc > 1) {
                 log_error("This program takes no argument.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
@@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        ret = 0;
+        ret = EXIT_SUCCESS;
 
         while ((me = getmntent(f))) {
                 pid_t pid;
@@ -92,7 +92,7 @@ int main(int argc, char *argv[]) {
                         execv("/bin/mount", (char **) arguments);
 
                         log_error("Failed to execute /bin/mount: %m");
-                        _exit(1);
+                        _exit(EXIT_FAILURE);
                 }
 
                 /* Parent */
@@ -101,7 +101,7 @@ int main(int argc, char *argv[]) {
 
                 if ((k = hashmap_put(pids, UINT_TO_PTR(pid), s)) < 0) {
                         log_error("Failed to add PID to set: %s", strerror(-k));
-                        ret = 1;
+                        ret = EXIT_FAILURE;
                         continue;
                 }
         }
@@ -117,7 +117,7 @@ int main(int argc, char *argv[]) {
                                 continue;
 
                         log_error("waitid() failed: %m");
-                        ret = 1;
+                        ret = EXIT_FAILURE;
                         break;
                 }
 
@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) {
                                 else
                                         log_error("/bin/mount for %s terminated by signal %s.", s, signal_to_string(si.si_status));
 
-                                ret = 1;
+                                ret = EXIT_FAILURE;
                         }
 
                         free(s);

diff --git a/src/shutdownd.c b/src/shutdownd.c
index 5ff9b4ae127b0ee1b0888ff774fdfc8b6afb3831..72a28018cf565ac824c766b605d88ed6f30161aa 100644 (file)
--- a/src/shutdownd.c
+++ b/src/shutdownd.c
@@ -176,7 +176,7 @@ int main(int argc, char *argv[]) {
                 _FD_MAX
         };
 
-        int r = 4, n_fds;
+        int r = EXIT_FAILURE, n_fds;
         int one = 1;
         struct shutdownd_command c;
         struct pollfd pollfd[_FD_MAX];
@@ -185,12 +185,12 @@ int main(int argc, char *argv[]) {
 
         if (getppid() != 1) {
                 log_error("This program should be invoked by init only.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         if (argc > 1) {
                 log_error("This program does not take arguments.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
@@ -199,17 +199,17 @@ int main(int argc, char *argv[]) {
 
         if ((n_fds = sd_listen_fds(true)) < 0) {
                 log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
-                return 1;
+                return EXIT_FAILURE;
         }
 
         if (n_fds != 1) {
                 log_error("Need exactly one file descriptor.");
-                return 2;
+                return EXIT_FAILURE;
         }
 
         if (setsockopt(SD_LISTEN_FDS_START, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0) {
                 log_error("SO_PASSCRED failed: %m");
-                return 3;
+                return EXIT_FAILURE;
         }
 
         zero(c);
@@ -335,7 +335,7 @@ int main(int argc, char *argv[]) {
 
         } while (c.elapse > 0);
 
-        r = 0;
+        r = EXIT_SUCCESS;
 
         log_debug("systemd-shutdownd stopped as pid %lu", (unsigned long) getpid());
 

diff --git a/src/systemctl.c b/src/systemctl.c
index de41db79e2eb4e5bcd9bef7733fae1bae2476f04..a85257ff6e0e35541c4c9c880f0768e2b71b6003 100644 (file)
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -51,6 +51,7 @@
 #include "sd-daemon.h"
 #include "shutdownd.h"
 #include "exit-status.h"
+#include "bus-errors.h"
 
 static const char *arg_type = NULL;
 static char **arg_property = NULL;
@@ -69,11 +70,6 @@ static bool arg_quiet = false;
 static bool arg_full = false;
 static bool arg_force = false;
 static bool arg_defaults = false;
-static bool arg_sysv_compat = false; /* this is undocumented, and
-                                      * exists simply to make
-                                      * implementation of SysV
-                                      * compatible shell glue
-                                      * easier */
 static char **arg_wall = NULL;
 static usec_t arg_when = 0;
 static enum action {
@@ -145,6 +141,34 @@ static bool error_is_no_service(const DBusError *error) {
         return startswith(error->name, "org.freedesktop.DBus.Error.Spawn.");
 }
 
+static int translate_bus_error_to_exit_status(int r, const DBusError *error) {
+        assert(error);
+
+        if (!dbus_error_is_set(error))
+                return r;
+
+        if (dbus_error_has_name(error, DBUS_ERROR_ACCESS_DENIED) ||
+            dbus_error_has_name(error, BUS_ERROR_ONLY_BY_DEPENDENCY) ||
+            dbus_error_has_name(error, BUS_ERROR_NO_ISOLATION) ||
+            dbus_error_has_name(error, BUS_ERROR_TRANSACTION_IS_DESTRUCTIVE))
+                return EXIT_NOPERMISSION;
+
+        if (dbus_error_has_name(error, BUS_ERROR_NO_SUCH_UNIT))
+                return EXIT_NOTINSTALLED;
+
+        if (dbus_error_has_name(error, BUS_ERROR_JOB_TYPE_NOT_APPLICABLE) ||
+            dbus_error_has_name(error, BUS_ERROR_NOT_SUPPORTED))
+                return EXIT_NOTIMPLEMENTED;
+
+        if (dbus_error_has_name(error, BUS_ERROR_LOAD_FAILED))
+                return EXIT_NOTCONFIGURED;
+
+        if (r != 0)
+                return r;
+
+        return EXIT_FAILURE;
+}
+
 static int bus_iter_get_basic_and_next(DBusMessageIter *iter, int type, void *data, bool next) {
 
         assert(iter);
@@ -1072,10 +1096,10 @@ static int start_unit_one(
                 const char *method,
                 const char *name,
                 const char *mode,
+                DBusError *error,
                 Set *s) {
 
         DBusMessage *m = NULL, *reply = NULL;
-        DBusError error;
         const char *path;
         int r;
 
@@ -1083,10 +1107,9 @@ static int start_unit_one(
         assert(method);
         assert(name);
         assert(mode);
+        assert(error);
         assert(arg_no_block || s);
 
-        dbus_error_init(&error);
-
         if (!(m = dbus_message_new_method_call(
                               "org.freedesktop.systemd1",
                               "/org/freedesktop/systemd1",
@@ -1106,24 +1129,24 @@ static int start_unit_one(
                 goto finish;
         }
 
-        if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
+        if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error))) {
 
-                if (arg_action != ACTION_SYSTEMCTL && error_is_no_service(&error)) {
+                if (arg_action != ACTION_SYSTEMCTL && error_is_no_service(error)) {
                         /* There's always a fallback possible for
                          * legacy actions. */
                         r = 0;
                         goto finish;
                 }
 
-                log_error("Failed to issue method call: %s", bus_error_message(&error));
+                log_error("Failed to issue method call: %s", bus_error_message(error));
                 r = -EIO;
                 goto finish;
         }
 
-        if (!dbus_message_get_args(reply, &error,
+        if (!dbus_message_get_args(reply, error,
                                    DBUS_TYPE_OBJECT_PATH, &path,
                                    DBUS_TYPE_INVALID)) {
-                log_error("Failed to parse reply: %s", bus_error_message(&error));
+                log_error("Failed to parse reply: %s", bus_error_message(error));
                 r = -EIO;
                 goto finish;
         }
@@ -1150,6 +1173,10 @@ static int start_unit_one(
 
         r = 1;
 
+        /* Returns 1 if we managed to issue the request, and 0 if we
+         * failed due to systemd not being around. This is then used
+         * as indication to try a fallback mechanism. */
+
 finish:
         if (m)
                 dbus_message_unref(m);
@@ -1157,8 +1184,6 @@ finish:
         if (reply)
                 dbus_message_unref(reply);
 
-        dbus_error_free(&error);
-
         return r;
 }
 
@@ -1194,10 +1219,13 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) {
                 [ACTION_DEFAULT] = SPECIAL_DEFAULT_TARGET
         };
 
-        int r;
+        int r, ret = 0;
         unsigned i;
         const char *method, *mode, *one_name;
         Set *s = NULL;
+        DBusError error;
+
+        dbus_error_init(&error);
 
         assert(bus);
 
@@ -1235,40 +1263,47 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) {
         }
 
         if (!arg_no_block) {
-                if ((r = enable_wait_for_jobs(bus)) < 0) {
-                        log_error("Could not watch jobs: %s", strerror(-r));
+                if ((ret = enable_wait_for_jobs(bus)) < 0) {
+                        log_error("Could not watch jobs: %s", strerror(-ret));
                         goto finish;
                 }
 
                 if (!(s = set_new(string_hash_func, string_compare_func))) {
                         log_error("Failed to allocate set.");
-                        r = -ENOMEM;
+                        ret = -ENOMEM;
                         goto finish;
                 }
         }
 
-        r = 0;
-
         if (one_name) {
-                if ((r = start_unit_one(bus, method, one_name, mode, s)) <= 0)
+                if ((ret = start_unit_one(bus, method, one_name, mode, &error, s)) <= 0)
                         goto finish;
         } else {
                 for (i = 1; i < n; i++)
-                        if ((r = start_unit_one(bus, method, args[i], mode, s)) < 0)
-                                goto finish;
+                        if ((r = start_unit_one(bus, method, args[i], mode, &error, s)) != 0) {
+
+                                if (r > 0)
+                                        ret = r;
+                                else
+                                        ret = translate_bus_error_to_exit_status(r, &error);
+
+                                dbus_error_free(&error);
+                        }
         }
 
         if (!arg_no_block)
-                if ((r = wait_for_jobs(bus, s)) < 0)
+                if ((r = wait_for_jobs(bus, s)) < 0) {
+                        ret = r;
                         goto finish;
-
-        r = 1;
+                }
 
 finish:
         if (s)
                 set_free_free(s);
 
-        return r;
+        dbus_error_free(&error);
+
+        return ret;
 }
 
 static int start_special(DBusConnection *bus, char **args, unsigned n) {
@@ -1290,7 +1325,7 @@ static int check_unit(DBusConnection *bus, char **args, unsigned n) {
         const char
                 *interface = "org.freedesktop.systemd1.Unit",
                 *property = "ActiveState";
-        int r = -EADDRNOTAVAIL;
+        int r = 3; /* According to LSB: "program is not running" */
         DBusError error;
         unsigned i;
 
@@ -2213,19 +2248,13 @@ static int show_one(DBusConnection *bus, const char *path, bool show_properties,
 
         r = 0;
 
-        if (!show_properties) {
-                if (arg_sysv_compat &&
-                    !streq_ptr(info.active_state, "active") &&
-                    !streq_ptr(info.active_state, "reloading")) {
+        if (!show_properties)
+                print_status_info(&info);
 
-                        /* If the SysV compatibility mode is on, we
-                         * will refuse to run "status" on units that
-                         * aren't active */
-                        log_error("Unit not active.");
-                        r = -EADDRNOTAVAIL;
-                } else
-                        print_status_info(&info);
-        }
+        if (!streq_ptr(info.active_state, "active") &&
+            !streq_ptr(info.active_state, "reloading"))
+                /* According to LSB: "program not running" */
+                r = 3;
 
         while ((p = info.exec)) {
                 LIST_REMOVE(ExecStatusInfo, exec, info.exec, p);
@@ -2246,7 +2275,7 @@ finish:
 
 static int show(DBusConnection *bus, char **args, unsigned n) {
         DBusMessage *m = NULL, *reply = NULL;
-        int r;
+        int r, ret = 0;
         DBusError error;
         unsigned i;
         bool show_properties, new_line = false;
@@ -2262,7 +2291,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                 /* If not argument is specified inspect the manager
                  * itself */
 
-                r = show_one(bus, "/org/freedesktop/systemd1", show_properties, &new_line);
+                ret = show_one(bus, "/org/freedesktop/systemd1", show_properties, &new_line);
                 goto finish;
         }
 
@@ -2280,7 +2309,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                                               "org.freedesktop.systemd1.Manager",
                                               "LoadUnit"))) {
                                 log_error("Could not allocate message.");
-                                r = -ENOMEM;
+                                ret = -ENOMEM;
                                 goto finish;
                         }
 
@@ -2288,7 +2317,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                                                       DBUS_TYPE_STRING, &args[i],
                                                       DBUS_TYPE_INVALID)) {
                                 log_error("Could not append arguments to message.");
-                                r = -ENOMEM;
+                                ret = -ENOMEM;
                                 goto finish;
                         }
 
@@ -2296,7 +2325,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
 
                                 if (!dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED)) {
                                         log_error("Failed to issue method call: %s", bus_error_message(&error));
-                                        r = -EIO;
+                                        ret = -EIO;
                                         goto finish;
                                 }
 
@@ -2309,7 +2338,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                                                       "org.freedesktop.systemd1.Manager",
                                                       "GetUnit"))) {
                                         log_error("Could not allocate message.");
-                                        r = -ENOMEM;
+                                        ret = -ENOMEM;
                                         goto finish;
                                 }
 
@@ -2317,13 +2346,17 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                                                               DBUS_TYPE_STRING, &args[i],
                                                               DBUS_TYPE_INVALID)) {
                                         log_error("Could not append arguments to message.");
-                                        r = -ENOMEM;
+                                        ret = -ENOMEM;
                                         goto finish;
                                 }
 
                                 if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
                                         log_error("Failed to issue method call: %s", bus_error_message(&error));
-                                        r = -EIO;
+
+                                        if (dbus_error_has_name(&error, BUS_ERROR_NO_SUCH_UNIT))
+                                                ret = 4; /* According to LSB: "program or service status is unknown" */
+                                        else
+                                                ret = -EIO;
                                         goto finish;
                                 }
                         }
@@ -2338,7 +2371,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                                               "org.freedesktop.systemd1.Manager",
                                               "GetJob"))) {
                                 log_error("Could not allocate message.");
-                                r = -ENOMEM;
+                                ret = -ENOMEM;
                                 goto finish;
                         }
 
@@ -2346,13 +2379,13 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                                                       DBUS_TYPE_UINT32, &id,
                                                       DBUS_TYPE_INVALID)) {
                                 log_error("Could not append arguments to message.");
-                                r = -ENOMEM;
+                                ret = -ENOMEM;
                                 goto finish;
                         }
 
                         if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
                                 log_error("Failed to issue method call: %s", bus_error_message(&error));
-                                r = -EIO;
+                                ret = -EIO;
                                 goto finish;
                         }
                 } else {
@@ -2365,7 +2398,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                                               "org.freedesktop.systemd1.Manager",
                                               "GetUnitByPID"))) {
                                 log_error("Could not allocate message.");
-                                r = -ENOMEM;
+                                ret = -ENOMEM;
                                 goto finish;
                         }
 
@@ -2373,13 +2406,13 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                                                       DBUS_TYPE_UINT32, &id,
                                                       DBUS_TYPE_INVALID)) {
                                 log_error("Could not append arguments to message.");
-                                r = -ENOMEM;
+                                ret = -ENOMEM;
                                 goto finish;
                         }
 
                         if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
                                 log_error("Failed to issue method call: %s", bus_error_message(&error));
-                                r = -EIO;
+                                ret = -EIO;
                                 goto finish;
                         }
                 }
@@ -2388,20 +2421,18 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                                            DBUS_TYPE_OBJECT_PATH, &path,
                                            DBUS_TYPE_INVALID)) {
                         log_error("Failed to parse reply: %s", bus_error_message(&error));
-                        r = -EIO;
+                        ret = -EIO;
                         goto finish;
                 }
 
-                if ((r = show_one(bus, path, show_properties, &new_line)) < 0)
-                        goto finish;
+                if ((r = show_one(bus, path, show_properties, &new_line)) != 0)
+                        ret = r;
 
                 dbus_message_unref(m);
                 dbus_message_unref(reply);
                 m = reply = NULL;
         }
 
-        r = 0;
-
 finish:
         if (m)
                 dbus_message_unref(m);
@@ -2411,7 +2442,7 @@ finish:
 
         dbus_error_free(&error);
 
-        return r;
+        return ret;
 }
 
 static DBusHandlerResult monitor_filter(DBusConnection *connection, DBusMessage *message, void *data) {
@@ -3967,8 +3998,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                 ARG_FULL,
                 ARG_FORCE,
                 ARG_NO_RELOAD,
-                ARG_DEFAULTS,
-                ARG_SYSV_COMPAT
+                ARG_DEFAULTS
         };
 
         static const struct option options[] = {
@@ -3989,7 +4019,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                 { "force",     no_argument,       NULL, ARG_FORCE     },
                 { "no-reload", no_argument,       NULL, ARG_NO_RELOAD },
                 { "defaults",  no_argument,       NULL, ARG_DEFAULTS  },
-                { "sysv-compat", no_argument,     NULL, ARG_SYSV_COMPAT },
                 { NULL,        0,                 NULL, 0             }
         };
 
@@ -4083,10 +4112,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         arg_defaults = true;
                         break;
 
-                case ARG_SYSV_COMPAT:
-                        arg_sysv_compat = true;
-                        break;
-
                 case '?':
                         return -EINVAL;
 
@@ -4781,11 +4806,6 @@ static int send_shutdownd(usec_t t, char mode, bool warn, const char *message) {
         struct msghdr msghdr;
         struct iovec iovec;
         union sockaddr_union sockaddr;
-        struct ucred *ucred;
-        union {
-                struct cmsghdr cmsghdr;
-                uint8_t buf[CMSG_SPACE(sizeof(struct ucred))];
-        } control;
         struct shutdownd_command c;
 
         zero(c);
@@ -4808,24 +4828,12 @@ static int send_shutdownd(usec_t t, char mode, bool warn, const char *message) {
         iovec.iov_base = (char*) &c;
         iovec.iov_len = sizeof(c);
 
-        zero(control);
-        control.cmsghdr.cmsg_level = SOL_SOCKET;
-        control.cmsghdr.cmsg_type = SCM_CREDENTIALS;
-        control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred));
-
-        ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr);
-        ucred->pid = getpid();
-        ucred->uid = getuid();
-        ucred->gid = getgid();
-
         zero(msghdr);
         msghdr.msg_name = &sockaddr;
         msghdr.msg_namelen = sizeof(sa_family_t) + 1 + sizeof("/org/freedesktop/systemd1/shutdownd") - 1;
 
         msghdr.msg_iov = &iovec;
         msghdr.msg_iovlen = 1;
-        msghdr.msg_control = &control;
-        msghdr.msg_controllen = control.cmsghdr.cmsg_len;
 
         if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) {
                 close_nointr_nofail(fd);
@@ -4972,7 +4980,7 @@ static int runlevel_main(void) {
 }
 
 int main(int argc, char*argv[]) {
-        int r, retval = 1;
+        int r, retval = EXIT_FAILURE;
         DBusConnection *bus = NULL;
         DBusError error;
 
@@ -4984,14 +4992,15 @@ int main(int argc, char*argv[]) {
         if ((r = parse_argv(argc, argv)) < 0)
                 goto finish;
         else if (r == 0) {
-                retval = 0;
+                retval = EXIT_SUCCESS;
                 goto finish;
         }
 
         /* /sbin/runlevel doesn't need to communicate via D-Bus, so
          * let's shortcut this */
         if (arg_action == ACTION_RUNLEVEL) {
-                retval = runlevel_main() < 0;
+                r = runlevel_main();
+                retval = r < 0 ? EXIT_FAILURE : r;
                 goto finish;
         }
 
@@ -4999,15 +5008,14 @@ int main(int argc, char*argv[]) {
 
         switch (arg_action) {
 
-        case ACTION_SYSTEMCTL: {
-                retval = systemctl_main(bus, argc, argv, &error) < 0;
+        case ACTION_SYSTEMCTL:
+                r = systemctl_main(bus, argc, argv, &error);
                 break;
-        }
 
         case ACTION_HALT:
         case ACTION_POWEROFF:
         case ACTION_REBOOT:
-                retval = halt_main(bus) < 0;
+                r = halt_main(bus);
                 break;
 
         case ACTION_RUNLEVEL2:
@@ -5017,16 +5025,16 @@ int main(int argc, char*argv[]) {
         case ACTION_RESCUE:
         case ACTION_EMERGENCY:
         case ACTION_DEFAULT:
-                retval = start_with_fallback(bus) < 0;
+                r = start_with_fallback(bus);
                 break;
 
         case ACTION_RELOAD:
         case ACTION_REEXEC:
-                retval = reload_with_fallback(bus) < 0;
+                r = reload_with_fallback(bus);
                 break;
 
         case ACTION_CANCEL_SHUTDOWN:
-                retval = send_shutdownd(0, 0, false, NULL) < 0;
+                r = send_shutdownd(0, 0, false, NULL);
                 break;
 
         case ACTION_INVALID:
@@ -5035,6 +5043,8 @@ int main(int argc, char*argv[]) {
                 assert_not_reached("Unknown action");
         }
 
+        retval = r < 0 ? EXIT_FAILURE : r;
+
 finish:
 
         if (bus) {

diff --git a/src/update-utmp.c b/src/update-utmp.c
index 644b6df67cb831627b646f570359375d3b7539a3..e45bee10ceee237699c3b707d8d4271da5398075 100644 (file)
--- a/src/update-utmp.c
+++ b/src/update-utmp.c
@@ -361,12 +361,12 @@ int main(int argc, char *argv[]) {
 
         if (getppid() != 1) {
                 log_error("This program should be invoked by init only.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         if (argc != 2) {
                 log_error("This program requires one argument.");
-                return 1;
+                return EXIT_FAILURE;
         }
 
         log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
@@ -413,5 +413,5 @@ finish:
         dbus_error_free(&error);
         dbus_shutdown();
 
-        return r < 0 ? 1 : 0;
+        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }