From 33e1e5a756300e29c74fdc59ea762f9394df8368 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Thu, 8 Jan 2015 23:34:21 -0500 Subject: 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. --- src/shared/path-lookup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/shared/path-lookup.c') diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index 1e5bb858e8..291a2f4054 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); -- cgit v1.2.3-54-g00ecf