about summary refs log tree commit diff
path: root/core-services/08-sysctl.sh
diff options
context:
space:
mode:
Diffstat (limited to 'core-services/08-sysctl.sh')
-rw-r--r--core-services/08-sysctl.sh28
1 files changed, 11 insertions, 17 deletions
diff --git a/core-services/08-sysctl.sh b/core-services/08-sysctl.sh
index 10aa73a..37d7b9f 100644
--- a/core-services/08-sysctl.sh
+++ b/core-services/08-sysctl.sh
@@ -1,22 +1,16 @@
 # vim: set ts=4 sw=4 et:
 
 if [ -x /sbin/sysctl -o -x /bin/sysctl ]; then
-    msg "Loading sysctl(8) settings...\n"
+    msg "Loading sysctl(8) settings..."
+    for i in /run/sysctl.d/*.conf \
+        /etc/sysctl.d/*.conf \
+        /usr/local/lib/sysctl.d/*.conf \
+        /usr/lib/sysctl.d/*.conf \
+        /etc/sysctl.conf; do
 
-    if sysctl -V >/dev/null 2>&1; then
-        sysctl --system
-    else
-        # Fallback for busybox sysctl
-        for i in /run/sysctl.d/*.conf \
-            /etc/sysctl.d/*.conf \
-            /usr/local/lib/sysctl.d/*.conf \
-            /usr/lib/sysctl.d/*.conf \
-            /etc/sysctl.conf; do
-
-            if [ -e "$i" ]; then
-                printf '* Applying %s ...\n' "$i"
-                sysctl -p "$i"
-            fi
-        done
-    fi
+        if [ -e "$i" ]; then
+            printf '* Applying %s ...\n' "$i"
+            sysctl -p "$i"
+        fi
+    done
 fi