lookup: always also look into /usr/lib for units

diff --git a/src/path-lookup.c b/src/path-lookup.c
index fff930469ca0ec6b9431f9e81c0a51ade8a6f928..e5533c04d9aa8ba9567f83c55bb7bdc0e6c773e1 100644 (file)
--- a/src/path-lookup.c
+++ b/src/path-lookup.c
@@ -102,7 +102,11 @@ static char** user_dirs(void) {
         if ((e = getenv("XDG_DATA_DIRS")))
                 data_dirs = strv_split(e, ":");
         else
         if ((e = getenv("XDG_DATA_DIRS")))
                 data_dirs = strv_split(e, ":");
         else

-                data_dirs = strv_new("/usr/local/share", "/usr/share", NULL);
+                data_dirs = strv_new("/usr/local/share",
+                                     "/usr/local/lib",
+                                     "/usr/share",
+                                     "/usr/lib",
+                                     NULL);

 
         if (!data_dirs)
                 goto fail;
 
         if (!data_dirs)
                 goto fail;


@@ -187,9 +191,11 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
                                               SYSTEM_CONFIG_UNIT_PATH,
                                               "/etc/systemd/system",
                                               "/usr/local/share/systemd/system",
                                               SYSTEM_CONFIG_UNIT_PATH,
                                               "/etc/systemd/system",
                                               "/usr/local/share/systemd/system",

+                                              "/usr/local/lib/systemd/system",

                                               "/usr/share/systemd/system",
                                               "/usr/share/systemd/system",

-                                              "/lib/systemd/system",
+                                              "/usr/lib/systemd/system",

                                               SYSTEM_DATA_UNIT_PATH,
                                               SYSTEM_DATA_UNIT_PATH,

+                                              "/lib/systemd/system",

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