summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/binfmt/binfmt.c2
-rw-r--r--src/modules-load.c2
-rw-r--r--src/path-lookup.c6
-rw-r--r--src/sysctl.c2
-rw-r--r--src/systemd.pc.in4
-rw-r--r--src/tmpfiles.c2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index e8d6524391..0e60618e90 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 043e909d80..77fe3eaf26 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 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,
diff --git a/src/sysctl.c b/src/sysctl.c
index 8bdfb0811c..852ec91c9c 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 4f2abb0868..61de30561b 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 8cbce12dcd..873bf233fd 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);