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=814cfea592743606d56d5012c60688ef4be40bc6;hb=e3e9cc803e28185cf32feb3cccc092ec9bcff4ff;hpb=44143309dd0b37d61d7d842ca58f01a65646ec71

diff --git a/src/sysctl.c b/src/sysctl.c
index 814cfea59..76ce9d864 100644
--- a/src/sysctl.c
+++ b/src/sysctl.c
@@ -138,12 +138,13 @@ 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/lib/sysctl.d",
                                     "/usr/lib/sysctl.d",
+                                    "/lib/sysctl.d",
                                     NULL);
                 if (r < 0) {
                         log_error("Failed to enumerate sysctl.d files: %s", strerror(-r));
@@ -158,6 +159,8 @@ int main(int argc, char *argv[]) {
                                 r = k;
                 }
 
+                apply_file("/etc/sysctl.conf", true);
+
                 strv_free(files);
         }
 finish: