[systemd-commits] src/sysctl.c

[Lennart Poettering]

 src/sysctl.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cb80401132edc9c0a717abb55b54d3a8016cd5ce
Author: Ludwig Nussel <ludwig.nussel at suse.de>
Date:   Mon May 16 11:11:52 2011 +0200

    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 09c0a6a..76ce9d8 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: