Set sysctl setting using syctl --system option.

diff --git a/lib/functions b/lib/functions
index b696738fa22daa711ca7c7ab32f5562ee1581e58..3b97077b83460518fc0494032e3c89f94aac719a 100644 (file)
--- a/lib/functions
+++ b/lib/functions
@@ -180,20 +180,7 @@ apply_sysctl() {
                return
        fi
 
-       local file
-       for file in /usr/lib/sysctl.d/*.conf; do
-               [ -f "/run/sysctl.d/${file##*/}" ] && continue
-               [ -f "/etc/sysctl.d/${file##*/}" ] && continue
-               test -f "$file" && sysctl -q -e -p "$file"
-       done
-       for file in /run/sysctl.d/*.conf; do
-               [ -f "/etc/sysctl.d/${file##*/}" ] && continue
-               test -f "$file" && sysctl -q -e -p "$file"
-       done
-       for file in /etc/sysctl.d/*.conf; do
-               test -f "$file" && sysctl -q -e -p "$file"
-       done
-       sysctl -q -e -p /etc/sysctl.conf
+       sysctl -q -e --system
 }
 
 if is_yes "$FASTRC" || is_yes "$IN_SHUTDOWN"; then
@@ -201,8 +188,8 @@ if is_yes "$FASTRC" || is_yes "$IN_SHUTDOWN"; then
 fi
 
 if is_no "$RC_LOGGING"; then
-       initlog() {
-               RESULT=0
+               initlog() {
+                       RESULT=0
                while [ "$1" != "${1##-}" ]; do
                        case $1 in
                        -c)