Move sysctl.conf/sysctl.d handling to a function, call it where appropriate. (#624385, continued)

Conflicts:

	rc.d/init.d/functions

[Petr Lautrbach <plautrba@redhat.com>: resolved conflicts]

3 files changed, 13 insertions, 7 deletions

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index c1d0e073..cb989835 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -579,5 +579,15 @@ is_ignored_file() {
     esac
     return 1
 }
+
+# Apply sysctl settings, including files in /etc/sysctl.d
+apply_sysctl() {
+    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
+}
+
 # A sed expression to filter out the files that is_ignored_file recognizes
 __sed_discard_ignored_files='/\(~\|\.bak\|\.orig\|\.rpmnew\|\.rpmorig\|\.rpmsave\)$/d'
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 50617aee..897cf76b 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -62,7 +62,7 @@ case "$1" in
 		fi
 	fi
   
-	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+	apply_sysctl
 
 	# bring up loopback interface
 	action $"Bringing up loopback interface: " ./ifup ifcfg-lo
@@ -170,7 +170,7 @@ case "$1" in
  		fi
  	fi
 	# Run this again to catch any interface-specific actions
-	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+	apply_sysctl
  
         touch /var/lock/subsys/network
 
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 331553c4..e8655b08 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -363,11 +363,7 @@ fi
 
 # 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
 
 if [ -x /bin/loadkeys ]; then
  KEYTABLE=