]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
path-lookup: add configured unit paths back into search path
authorLennart Poettering <lennart@poettering.net>
Wed, 24 Feb 2016 23:54:31 +0000 (00:54 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 12 Apr 2016 11:43:30 +0000 (13:43 +0200)
After all, for test builds they might differ from /etc/systemd/{user|system},
hence they should be included.

src/shared/path-lookup.c

index 93dd83652f685acd7ece7a3a7d6e4f6721de3a85..11b9bb6107ab0a303dae31b3e0540c5752376a3f 100644 (file)
@@ -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",