summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-25 02:32:19 +0100
committerLennart Poettering <lennart@poettering.net>2016-04-12 13:43:30 +0200
commita14533430498bfaa91ba19b7fd0268bd2ef7d797 (patch)
treee68d2113d18cdfaa3bcfdf4a0289b0dd1108cfd8 /src/core
parentcd64fd56134ef00cce0651e741d4ebda3791d97b (diff)
core: rework logic to drop duplicate and non-existing items from search path
Move this into a function of its own, so that we can run it after we ran the generators, so that it takes into account removed generator dirs.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/manager.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index d48b41d88f..55f2f49a06 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1120,6 +1120,7 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
if (r < 0)
return r;
+ lookup_paths_reduce(&m->lookup_paths);
manager_build_unit_path_cache(m);
/* If we will deserialize make sure that during enumeration
@@ -2540,6 +2541,7 @@ int manager_reload(Manager *m) {
if (q < 0 && r >= 0)
r = q;
+ lookup_paths_reduce(&m->lookup_paths);
manager_build_unit_path_cache(m);
/* First, enumerate what we can from all config files */