1ff636
From d2deeea1d5aa1d13139b9e9f70c6655abb589530 Mon Sep 17 00:00:00 2001
a4b143
From: Harald Hoyer <harald@redhat.com>
a4b143
Date: Mon, 11 Nov 2013 11:17:57 +0100
a4b143
Subject: [PATCH] sysctl: bring back /etc/sysctl.conf
a4b143
a4b143
Read /etc/sysctl.conf as the last file, overwriting everything.
a4b143
---
a4b143
 src/sysctl/sysctl.c | 4 ++++
a4b143
 1 file changed, 4 insertions(+)
a4b143
a4b143
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
c62b8e
index 275a5b74ae..d007c932c6 100644
a4b143
--- a/src/sysctl/sysctl.c
a4b143
+++ b/src/sysctl/sysctl.c
1ff636
@@ -320,6 +320,10 @@ int main(int argc, char *argv[]) {
a4b143
                         if (k < 0 && r == 0)
a4b143
                                 r = k;
a4b143
                 }
a4b143
+
a4b143
+                k = parse_file(sysctl_options, "/etc/sysctl.conf", true);
a4b143
+                if (k < 0 && r == 0)
a4b143
+                        r = k;
a4b143
         }
a4b143
 
a4b143
         k = apply_all(sysctl_options);