From f4852e09cd32f33b0c496864171d8dc9e85bd0cf Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 20 Apr 2012 15:01:24 -0400
Subject: Move default sysctl.conf to /usr/lib/sysctl.d, adjust things
 accordingly. (#760254)

Also, update apply_sysctl to 1) use systemd-sysctl if it's there 2) imitate it if it's not.
---
 rc.d/init.d/functions | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'rc.d/init.d/functions')

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 7754ff21..e9892b42 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -660,11 +660,26 @@ is_false() {
 
 # 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
+    if [ -x /lib/systemd/systemd-sysctl ]; then
+	/lib/systemd/systemd-sysctl
+    else
+        for file in /usr/lib/sysctl.d/*.conf ; do
+            is_ignored_file "$file" && continue
+            [ -f /run/sysctl.d/${file##*/} ] && continue
+            [ -f /etc/sysctl.d/${file##*/} ] && continue
+            test -f "$file" && sysctl -e -p "$file" >/dev/null 2>&1
+        done
+        for file in /run/sysctl.d/*.conf ; do
+            is_ignored_file "$file" && continue
+            [ -f /etc/sysctl.d/${file##*/} ] && continue
+            test -f "$file" && sysctl -e -p "$file" >/dev/null 2>&1
+        done
+        for file in /etc/sysctl.d/*.conf ; do
+            is_ignored_file "$file" && continue
+            test -f "$file" && sysctl -e -p "$file" >/dev/null 2>&1
+        done
+        sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+    fi
 }
 
 key_is_random() {
-- 
cgit v1.2.1