X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fpath-lookup.c;h=b45467c98df35f6ce6476c50d6dd8d282e40fb8d;hp=1a21ca078ad8f74c50f73223b0cd57a4877704d6;hb=b1bc08e599ae7760c7bcb29923ef5e1f92be2af7;hpb=607df95be184308b6bb7a5534f04109c67c039c3

diff --git a/src/path-lookup.c b/src/path-lookup.c
index 1a21ca078..b45467c98 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;
@@ -183,11 +187,11 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
                         if (!(p->unit_path = strv_new(
                                               /* If you modify this you also want to modify
                                                * systemdsystemunitpath= in systemd.pc.in! */
-                                              "/dev/.systemd/system",
+                                              "/run/systemd/system",
                                               SYSTEM_CONFIG_UNIT_PATH,
                                               "/etc/systemd/system",
-                                              "/usr/local/share/systemd/system",
-                                              "/usr/share/systemd/system",
+                                              "/usr/local/lib/systemd/system",
+                                              "/usr/lib/systemd/system",
                                               "/lib/systemd/system",
                                               SYSTEM_DATA_UNIT_PATH,
                                               NULL)))
@@ -199,6 +203,7 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
                         return -ENOMEM;
 
         strv_uniq(p->unit_path);
+        strv_path_remove_empty(p->unit_path);
 
         if (!strv_isempty(p->unit_path)) {
 
@@ -253,6 +258,9 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
                 strv_uniq(p->sysvinit_path);
                 strv_uniq(p->sysvrcnd_path);
 
+                strv_path_remove_empty(p->sysvinit_path);
+                strv_path_remove_empty(p->sysvrcnd_path);
+
                 if (!strv_isempty(p->sysvinit_path)) {
 
                         if (!(t = strv_join(p->sysvinit_path, "\n\t")))