From 3f296db591da779000a301b2b29560ee6df413f3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 28 Feb 2011 16:56:40 -0500
Subject: Move sysctl.conf/sysctl.d handling to a function, call it where
 appropriate. (#593211, continued)

---
 rc.d/rc.sysinit | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index f8f701af..3973c444 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -151,11 +151,7 @@ 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/* ; do
-	is_ignored_file "$file" && continue
-	test -f "$file" && sysctl -e -p "$file" >/dev/null 2>&1
-done
+apply_sysctl
 
 # Set the hostname.
 update_boot_stage RChostname
-- 
cgit v1.2.1