diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-03-14 14:25:05 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-03-14 14:25:05 +0100 |
| commit | fc1a2e06a2eab6ca16664adb83b61fe958f00598 (patch) | |
| tree | 1d0e6d63cddde5d36fe99baf7cc74c9a891fb861 /src/path-lookup.c | |
| parent | 45dc3a0478c61e83dedf26dc247fd3ddd2b20978 (diff) | |
conf: when looking for configurations look in /etc first, in /run second
After long consideration we came to the conclusion that user
configuration in /etc should always override the (generally computer
generated) configuration in /run. User configuration should always be
what matters over anything else. Hence rearrange the search orders
accordingly.
In general this should change very little as overriding like this is
seldomn done so far, and the order between /etc and /usr stays the same.
Diffstat (limited to 'src/path-lookup.c')
| -rw-r--r-- | src/path-lookup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/path-lookup.c b/src/path-lookup.c index 93fdf63699..e6f050d4ff 100644 --- a/src/path-lookup.c +++ b/src/path-lookup.c @@ -54,9 +54,9 @@ int user_config_home(char **config_home) { static char** user_dirs(void) { const char * const config_unit_paths[] = { - "/run/systemd/user", USER_CONFIG_UNIT_PATH, "/etc/systemd/user", + "/run/systemd/user", NULL }; @@ -207,9 +207,9 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as, bool personal /* If you modify this you also want to modify * systemduserunitpath= in systemd.pc.in, and * the arrays in user_dirs() above! */ - "/run/systemd/user", USER_CONFIG_UNIT_PATH, "/etc/systemd/user", + "/run/systemd/user", "/usr/local/lib/systemd/user", "/usr/local/share/systemd/user", USER_DATA_UNIT_PATH, @@ -224,9 +224,9 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as, bool personal if (!(p->unit_path = strv_new( /* If you modify this you also want to modify * systemdsystemunitpath= in systemd.pc.in! */ - "/run/systemd/system", SYSTEM_CONFIG_UNIT_PATH, "/etc/systemd/system", + "/run/systemd/system", "/usr/local/lib/systemd/system", "/usr/lib/systemd/system", SYSTEM_DATA_UNIT_PATH, |