From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 4 Mar 2011 18:48:38 +0000 (+0100)
Subject: systemctl: fix exit code when directing is-enabled to chkconfig
X-Git-Tag: v20~22
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63a723f3a7caf4eb1bc46a3849f59f27337924b7;p=systemd

systemctl: fix exit code when directing is-enabled to chkconfig
---

diff --git a/src/systemctl.c b/src/systemctl.c
index b733b47c..6adcbcc0 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -4087,10 +4087,15 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo
                                         return r;
 
                                 if (status.si_code == CLD_EXITED) {
-                                        if (status.si_status == 0 && (streq(verb, "enable") || streq(verb, "disable")))
+
+                                        if (streq(verb, "is-enabled"))
+                                                return status.si_status == 0 ? 1 : 0;
+
+                                        if (status.si_status == 0)
                                                 n_symlinks ++;
 
                                         return status.si_status == 0 ? 0 : -EINVAL;
+
                                 } else
                                         return -EPROTO;
                         }
@@ -4193,6 +4198,8 @@ static int enable_unit(DBusConnection *bus, char **args, unsigned n) {
                         goto finish;
                 }
 
+        r = 0;
+
         while ((i = hashmap_first(will_install))) {
                 int q;