X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsysctl.c;h=76ce9d864067f196f29e6c3327215d5a6cfe8d39;hp=efa2f53f26836ab2923322b8bcf4dfbfcfecb659;hb=e3e9cc803e28185cf32feb3cccc092ec9bcff4ff;hpb=223a35581604897185c46dfc184b0fa32916d59b

diff --git a/src/sysctl.c b/src/sysctl.c
index efa2f53f2..76ce9d864 100644
--- a/src/sysctl.c
+++ b/src/sysctl.c
@@ -138,12 +138,11 @@ 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",
                                     "/etc/sysctl.d",
-                                    "/usr/local/sysctl.d",
+                                    "/usr/local/lib/sysctl.d",
                                     "/usr/lib/sysctl.d",
                                     "/lib/sysctl.d",
                                     NULL);
@@ -160,6 +159,8 @@ int main(int argc, char *argv[]) {
                                 r = k;
                 }
 
+                apply_file("/etc/sysctl.conf", true);
+
                 strv_free(files);
         }
 finish: