summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLudwig Nussel <ludwig.nussel@suse.de>2011-05-16 11:11:52 +0200
committerLennart Poettering <lennart@poettering.net>2011-05-16 23:36:52 +0200
commitcb80401132edc9c0a717abb55b54d3a8016cd5ce (patch)
tree843dc6d19a127128f499f72a4b0178d03df4845b /src
parent84bccb47a7bbacbfc0a05ff8fa208758bef83957 (diff)
sysctl: apply /etc/sysctl.conf last
apply /etc/sysctl.conf last to actually allow the admin to override package provided defaults.
Diffstat (limited to 'src')
-rw-r--r--src/sysctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sysctl.c b/src/sysctl.c
index 09c0a6a615..76ce9d8640 100644
--- a/src/sysctl.c
+++ b/src/sysctl.c
@@ -138,7 +138,6 @@ int main(int argc, char *argv[]) {
else {
char **files, **f;
- apply_file("/etc/sysctl.conf", true);
r = conf_files_list(&files, ".conf",
"/run/sysctl.d",
@@ -160,6 +159,8 @@ int main(int argc, char *argv[]) {
r = k;
}
+ apply_file("/etc/sysctl.conf", true);
+
strv_free(files);
}
finish: