X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fpath-lookup.c;h=00003620a57a88e2e604625682bdf96e44dffa60;hb=b95cf3629e8d78a0d28e71b0f5559fa9a8c038b5;hp=7a5b9b813e0a02610421c22c8faa5a725700dc9c;hpb=10e87ee7f66b59a504c0ed2025463ba5faa69923;p=elogind.git diff --git a/src/path-lookup.c b/src/path-lookup.c index 7a5b9b813..00003620a 100644 --- 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"))) @@ -181,13 +181,17 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) { return -ENOMEM; } else if (!(p->unit_path = strv_new( - SYSTEM_CONFIG_UNIT_PATH, /* /etc/systemd/system/ */ - SYSTEM_DATA_UNIT_PATH, /* /lib/systemd/system/ */ + SYSTEM_CONFIG_UNIT_PATH, + "/etc/systemd/system", + "/usr/local/share/systemd/system", + "/usr/share/systemd/system", + "/lib/systemd/system", + SYSTEM_DATA_UNIT_PATH, 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")))