From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 4 Apr 2011 17:02:32 +0000 (+0200)
Subject: lookup: always also look into /usr/lib for units
X-Git-Tag: v23~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ef3102bf436a88fe565de1be655cdb8ca853c495;ds=sidebyside

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

diff --git a/src/path-lookup.c b/src/path-lookup.c
index fff930469..e5533c04d 100644
--- 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
-                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;
@@ -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",
+                                              "/usr/local/lib/systemd/system",
                                               "/usr/share/systemd/system",
-                                              "/lib/systemd/system",
+                                              "/usr/lib/systemd/system",
                                               SYSTEM_DATA_UNIT_PATH,
+                                              "/lib/systemd/system",
                                               NULL)))
                                 return -ENOMEM;
         }