From 09327f429fa8865c5a029dd4e9b029f5db1534e7 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sat, 24 Mar 2012 14:37:08 -0500 Subject: Allow files in sysctl.d to override sysctl.conf reported-by: Peter Gantner (a.k.a. nephros) X-Gentoo-Bug: 406631 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=406631 --- init.d/sysctl.BSD.in | 2 +- init.d/sysctl.Linux.in | 2 +- 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 -- cgit v1.2.3