From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 24 Feb 2016 23:54:31 +0000 (+0100)
Subject: path-lookup: add configured unit paths back into search path
X-Git-Tag: v230~185^2~51
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=5f0a41dade626da20000890807bc61f5d4359fb5;p=systemd%2F.git

path-lookup: add configured unit paths back into search path

After all, for test builds they might differ from /etc/systemd/{user|system},
hence they should be included.
---

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 93dd83652f..11b9bb6107 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -451,6 +451,7 @@ int lookup_paths_init(
                                          * systemdsystemunitpath= in systemd.pc.in! */
                                         STRV_IFNOTNULL(generator_early),
                                         persistent_config,
+                                        SYSTEM_CONFIG_UNIT_PATH,
                                         "/etc/systemd/system",
                                         runtime_config,
                                         "/run/systemd/system",
@@ -472,6 +473,7 @@ int lookup_paths_init(
                                          * the arrays in user_dirs() above! */
                                         STRV_IFNOTNULL(generator_early),
                                         persistent_config,
+                                        USER_CONFIG_UNIT_PATH,
                                         "/etc/systemd/user",
                                         runtime_config,
                                         "/run/systemd/user",