summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-04 19:02:32 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-04 19:02:32 +0200
commitef3102bf436a88fe565de1be655cdb8ca853c495 (patch)
tree0d970940c31a416425988c38b46b9bc49d19e9f9
parent3d57c6ab801f4437f12948e29589e3d00c3ad9db (diff)
lookup: always also look into /usr/lib for units
-rw-r--r--src/path-lookup.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/path-lookup.c b/src/path-lookup.c
index fff930469c..e5533c04d9 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;
}