From: Lennart Poettering Date: Wed, 14 Mar 2012 13:25:05 +0000 (+0100) Subject: conf: when looking for configurations look in /etc first, in /run second X-Git-Tag: v44~35 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc1a2e06a2eab6ca16664adb83b61fe958f00598;p=thirdparty%2Fsystemd.git 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. --- diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml index 966778ded27..f5ec805e29c 100644 --- a/man/binfmt.d.xml +++ b/man/binfmt.d.xml @@ -46,9 +46,9 @@ - /usr/lib/binfmt.d/*.conf /etc/binfmt.d/*.conf /run/binfmt.d/*.conf + /usr/lib/binfmt.d/*.conf diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index b6336634754..e2f7d5c68cb 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -46,9 +46,9 @@ - /usr/lib/modules-load.d/*.conf /etc/modules-load.d/*.conf /run/modules-load.d/*.conf + /usr/lib/modules-load.d/*.conf diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml index 240aa811379..9c108b0b7c3 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -46,9 +46,9 @@ - /usr/lib/sysctl.d/*.conf /etc/sysctl.d/*.conf /run/sysctl.d/*.conf + /usr/lib/sysctl.d/*.conf diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index b6bf3630e94..f70bf0ef9f7 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -47,9 +47,9 @@ - /usr/lib/tmpfiles.d/*.conf /etc/tmpfiles.d/*.conf /run/tmpfiles.d/*.conf + /usr/lib/tmpfiles.d/*.conf diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index e8d65243918..0e60618e908 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -138,8 +138,8 @@ int main(int argc, char *argv[]) { write_one_line_file("/proc/sys/fs/binfmt_misc/status", "-1"); r = conf_files_list(&files, ".conf", - "/run/binfmt.d", "/etc/binfmt.d", + "/run/binfmt.d", "/usr/local/lib/binfmt.d", "/usr/lib/binfmt.d", NULL); diff --git a/src/modules-load.c b/src/modules-load.c index 043e909d809..77fe3eaf264 100644 --- a/src/modules-load.c +++ b/src/modules-load.c @@ -68,8 +68,8 @@ int main(int argc, char *argv[]) { kmod_set_log_fn(ctx, systemd_kmod_log, NULL); if (conf_files_list(&files, ".conf", - "/run/modules-load.d", "/etc/modules-load.d", + "/run/modules-load.d", "/usr/local/lib/modules-load.d", "/usr/lib/modules-load.d", "/lib/modules-load.d", diff --git a/src/path-lookup.c b/src/path-lookup.c index 93fdf636991..e6f050d4ff6 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, diff --git a/src/sysctl.c b/src/sysctl.c index 8bdfb0811ce..852ec91c9c9 100644 --- a/src/sysctl.c +++ b/src/sysctl.c @@ -236,8 +236,8 @@ int main(int argc, char *argv[]) { char **files, **f; r = conf_files_list(&files, ".conf", - "/run/sysctl.d", "/etc/sysctl.d", + "/run/sysctl.d", "/usr/local/lib/sysctl.d", "/usr/lib/sysctl.d", "/lib/sysctl.d", diff --git a/src/systemd.pc.in b/src/systemd.pc.in index 4f2abb08689..61de30561b9 100644 --- a/src/systemd.pc.in +++ b/src/systemd.pc.in @@ -12,8 +12,8 @@ systemdsystemunitdir=@systemunitdir@ systemduserunitdir=@userunitdir@ systemdsystemconfdir=@pkgsysconfdir@/system systemduserconfdir=@pkgsysconfdir@/user -systemdsystemunitpath=/run/systemd/system:${systemdsystemconfdir}:/etc/systemd/system:/usr/local/share/systemd/system:/usr/local/lib/systemd/system:/usr/share/systemd/system:/usr/lib/systemd/system:/lib/systemd/system:${systemdsystemunitdir} -systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/usr/local/share/systemd/user:/usr/local/lib/systemd/user:/usr/share/systemd/user:/usr/lib/systemd/user:${systemduserunitdir} +systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/share/systemd/system:/usr/local/lib/systemd/system:/usr/share/systemd/system:/usr/lib/systemd/system:/lib/systemd/system:${systemdsystemunitdir} +systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/share/systemd/user:/usr/local/lib/systemd/user:/usr/share/systemd/user:/usr/lib/systemd/user:${systemduserunitdir} Name: systemd Description: systemd System and Service Manager diff --git a/src/tmpfiles.c b/src/tmpfiles.c index 8cbce12dcd1..873bf233fd3 100644 --- a/src/tmpfiles.c +++ b/src/tmpfiles.c @@ -1271,8 +1271,8 @@ int main(int argc, char *argv[]) { char **files, **f; r = conf_files_list(&files, ".conf", - "/run/tmpfiles.d", "/etc/tmpfiles.d", + "/run/tmpfiles.d", "/usr/local/lib/tmpfiles.d", "/usr/lib/tmpfiles.d", NULL);