From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 9 Jan 2015 04:34:21 +0000 (-0500)
Subject: path-lookup: allow /run to override /etc in generator search
X-Git-Tag: v219~566
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=33e1e5a756300e29c74fdc59ea762f9394df8368

path-lookup: allow /run to override /etc in generator search

Generators are different than unit files: they are never automatically
generated, so there's no point in allowing /etc to override /run. On
the other hand, overriding /etc might be useful in some cases.
---

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 1e5bb858e..291a2f405 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -222,14 +222,14 @@ static char** user_dirs(
 
 char **generator_paths(SystemdRunningAs running_as) {
         if (running_as == SYSTEMD_USER)
-                return strv_new("/etc/systemd/user-generators",
-                                "/run/systemd/user-generators",
+                return strv_new("/run/systemd/user-generators",
+                                "/etc/systemd/user-generators",
                                 "/usr/local/lib/systemd/user-generators",
                                 USER_GENERATOR_PATH,
                                 NULL);
         else
-                return strv_new("/etc/systemd/system-generators",
-                                "/run/systemd/system-generators",
+                return strv_new("/run/systemd/system-generators",
+                                "/etc/systemd/system-generators",
                                 "/usr/local/lib/systemd/system-generators",
                                 SYSTEM_GENERATOR_PATH,
                                 NULL);