From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 Apr 2016 14:13:28 +0000 (+0200)
Subject: systemctl: when we want to know whether there's a native unit file, don't choke on... 
X-Git-Tag: v230~185^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2973%2Fhead;p=thirdparty%2Fsystemd.git

systemctl: when we want to know whether there's a native unit file, don't choke on ELOOP

ELOOP indicates that there's a symlink in /etc for a native unit file, and
that's completely OK.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 9efdc63dde7..f0e788a5085 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5272,9 +5272,9 @@ static int enable_sysv_units(const char *verb, char **args) {
                         continue;
 
                 j = unit_file_exists(arg_scope, &paths, name);
-                if (j < 0)
+                if (j < 0 && !IN_SET(j, -ELOOP, -ESHUTDOWN, -EADDRNOTAVAIL))
                         return log_error_errno(j, "Failed to lookup unit file state: %m");
-                found_native = j > 0;
+                found_native = j != 0;
 
                 /* If we have both a native unit and a SysV script, enable/disable them both (below); for is-enabled,
                  * prefer the native unit */
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index cae920eb3bf..9392a3d2b56 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -807,10 +807,10 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) {
                                 continue;
 
                         r = unit_file_exists(UNIT_FILE_SYSTEM, lp, name);
-                        if (r < 0) {
+                        if (r < 0 && !IN_SET(r, -ELOOP, -ESHUTDOWN, -EADDRNOTAVAIL)) {
                                 log_debug_errno(r, "Failed to detect whether %s exists, skipping: %m", name);
                                 continue;
-                        } else if (r > 0) {
+                        } else if (r != 0) {
                                 log_debug("Native unit for %s already exists, skipping.", name);
                                 continue;
                         }