diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-04-07 19:18:59 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-04-12 13:43:32 +0200 |
commit | 5ae87056e3dc1162c2088daf0cb5affb0480ae54 (patch) | |
tree | b023eb26e4b7781d6a22cdc03817805998b921ab | |
parent | 4943d14306c3e456525fdb793e7f48efea5b9236 (diff) |
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.
-rw-r--r-- | src/sysv-generator/sysv-generator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index e44304c16a..cae920eb3b 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; } |