aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-03-24 14:37:08 -0500
committerWilliam Hubbs <williamh@gentoo.org>2012-03-24 14:37:08 -0500
commit09327f429fa8865c5a029dd4e9b029f5db1534e7 (patch)
tree8e2a35b9f2b3b0de23bd8ee6bb8017fefed02d50
parent8104618d10bb4c06e87c723b3359cb9d5871fd51 (diff)
Allow files in sysctl.d to override sysctl.conf
reported-by: Peter Gantner (a.k.a. nephros) <gentoo@nephros.org> X-Gentoo-Bug: 406631 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=406631
-rw-r--r--init.d/sysctl.BSD.in2
-rw-r--r--init.d/sysctl.Linux.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/init.d/sysctl.BSD.in b/init.d/sysctl.BSD.in
index 4a86f878..2bfd0524 100644
--- a/init.d/sysctl.BSD.in
+++ b/init.d/sysctl.BSD.in
@@ -13,7 +13,7 @@ start()
local retval=0 var= comments= conf=
ebegin "Configuring kernel parameters"
eindent
- for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
+ for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
if [ -r "$conf" ]; then
vebegin "applying $conf"
while read var comments; do
diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index 00b4c334..d202cb31 100644
--- a/init.d/sysctl.Linux.in
+++ b/init.d/sysctl.Linux.in
@@ -15,7 +15,7 @@ start()
ebegin "Configuring kernel parameters"
eindent
- for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
+ for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
if [ -r "$conf" ]; then
vebegin "applying $conf"
if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then