From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Apr 2016 17:18:59 +0000 (+0200)
Subject: sysv-generator: port to use new unit_file_exists() call
X-Git-Tag: v230~185^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ae87056e3dc1162c2088daf0cb5affb0480ae54;p=thirdparty%2Fsystemd.git

sysv-generator: port to use new unit_file_exists() call

The code previously queries the state of a unit file, but was only interested
in the existance of it, hence let's use unit_file_exists() instead, the same
way the SysV compat code in systemctl does it.
---

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index e44304c16a4..cae920eb3bf 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -806,11 +806,11 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) {
                         if (hashmap_contains(all_services, name))
                                 continue;
 
-                        r = unit_file_lookup_state(UNIT_FILE_SYSTEM, lp, name, NULL);
-                        if (r < 0 && r != -ENOENT) {
+                        r = unit_file_exists(UNIT_FILE_SYSTEM, lp, name);
+                        if (r < 0) {
                                 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;
                         }