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/modules-load.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/modules-load.c')
| -rw-r--r-- | src/modules-load.c | 2 |
1 files changed, 1 insertions, 1 deletions
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", |