systemd: include /etc/systemd/system/ and /lib/systemd/system/ in search path uncondi...

[elogind.git] / src / path-lookup.c

diff --git a/src/path-lookup.c b/src/path-lookup.c
index 093e04de37d02d61566cb0b44be3379d0c440da5..00003620a57a88e2e604625682bdf96e44dffa60 100644 (file)
--- a/src/path-lookup.c
+++ b/src/path-lookup.c
@@ -181,13 +181,17 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
                                 return -ENOMEM;
                 } else
                         if (!(p->unit_path = strv_new(
                                 return -ENOMEM;
                 } else
                         if (!(p->unit_path = strv_new(

-                                              SYSTEM_CONFIG_UNIT_PATH,  /* /etc/systemd/system/ */
-                                              SYSTEM_DATA_UNIT_PATH,    /* /lib/systemd/system/ */
+                                              SYSTEM_CONFIG_UNIT_PATH,
+                                              "/etc/systemd/system",
+                                              "/usr/local/share/systemd/system",
+                                              "/usr/share/systemd/system",
+                                              "/lib/systemd/system",
+                                              SYSTEM_DATA_UNIT_PATH,

                                               NULL)))
                                 return -ENOMEM;
         }
 
                                               NULL)))
                                 return -ENOMEM;
         }
 

-        if (running_as == MANAGER_INIT) {
+        if (running_as == MANAGER_SYSTEM) {

                 /* /etc/init.d/ compatibility does not matter to users */
 
                 if ((e = getenv("SYSTEMD_SYSVINIT_PATH")))
                 /* /etc/init.d/ compatibility does not matter to users */
 
                 if ((e = getenv("SYSTEMD_SYSVINIT_PATH")))