From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Mon, 16 May 2011 09:11:52 +0000 (+0200)
Subject: sysctl: apply /etc/sysctl.conf last
X-Git-Tag: v27~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cb80401132edc9c0a717abb55b54d3a8016cd5ce;p=elogind.git

sysctl: apply /etc/sysctl.conf last

apply /etc/sysctl.conf last to actually allow the admin to override
package provided defaults.
---

diff --git a/src/sysctl.c b/src/sysctl.c
index 09c0a6a61..76ce9d864 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: