systemctl: return error codes for failed jobs

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

diff --git a/src/path-lookup.c b/src/path-lookup.c
index 7a5b9b813e0a02610421c22c8faa5a725700dc9c..2590eb3abfc8aeed823c8f34ec3fe6bb2abc152c 100644 (file)
--- a/src/path-lookup.c
+++ b/src/path-lookup.c
@@ -96,7 +96,7 @@ static char** session_dirs(void) {
                  * one. */
 
                 mkdir_parents(data_home, 0777);
-                symlink("../../../.config/systemd/session", data_home);
+                (void) symlink("../../../.config/systemd/session", data_home);
         }
 
         if ((e = getenv("XDG_DATA_DIRS")))
@@ -182,12 +182,14 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
                 } else
                         if (!(p->unit_path = strv_new(
                                               SYSTEM_CONFIG_UNIT_PATH,  /* /etc/systemd/system/ */
+                                              "/usr/local/share/systemd/system",
+                                              "/usr/share/systemd/system",
                                               SYSTEM_DATA_UNIT_PATH,    /* /lib/systemd/system/ */
                                               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")))