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/binfmt | |
| parent | 45dc3a0478c61e83dedf26dc247fd3ddd2b20978 (diff) | |
| download | systemd-fc1a2e06a2eab6ca16664adb83b61fe958f00598.tar.gz systemd-fc1a2e06a2eab6ca16664adb83b61fe958f00598.tar.bz2 systemd-fc1a2e06a2eab6ca16664adb83b61fe958f00598.zip | |
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/binfmt')
| -rw-r--r-- | src/binfmt/binfmt.c | 2 |
1 files changed, 1 insertions, 1 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); |