From e4bb56c7a946190c348a3c686af6cb35661fa5fe Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 25 Feb 2016 00:16:51 +0100 Subject: install: add root directory to LookupPaths structure We use the root directory parameter while putting together the LookupPaths structure, hence let's also store it in the structure as-is. That way we can drop a parameter from half of the functions in install.c Also, let's move the validation of the root paths into lookup_paths_init() so that we can drop even more code from install.c --- src/sysv-generator/sysv-generator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sysv-generator/sysv-generator.c') diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 3f5f24b4b9..fb7c47e1c8 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -806,7 +806,7 @@ 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, NULL, lp, name, NULL); + r = unit_file_lookup_state(UNIT_FILE_SYSTEM, lp, name, NULL); if (r < 0 && r != -ENOENT) { log_debug_errno(r, "Failed to detect whether %s exists, skipping: %m", name); continue; -- cgit v1.2.3-54-g00ecf