From 03f62929851774e0b91438bff50b82c4eb81046f Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Mon, 10 May 2010 17:21:04 +0200
Subject: let sysctl reads also from /etc/sysctl.d/*.conf files (#574870)

---
 rc.d/rc.sysinit | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'rc.d/rc.sysinit')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index bd0f0884..1c1f5d19 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -330,7 +330,9 @@ mount -n /dev/pts >/dev/null 2>&1
 
 # Configure kernel parameters
 update_boot_stage RCkernelparam
-sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+for file in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
+	[ -f $file ] && sysctl -e -p $file >/dev/null 2>&1
+done
 
 # Set the hostname.
 update_boot_stage RChostname
-- 
cgit v1.2.1