Merge branch 'master' of ssh://people.ipfire.org/pub/git/ipfire-2.x

[people/mfischer/ipfire-2.x.git] / src / initscripts / system / sysctl

diff --git a/src/initscripts/system/sysctl b/src/initscripts/system/sysctl
index 296d589c59574dae39c5523e9f061cf51f053277..ad767fb6d7cbae932fbd292b368bf1ffc864c066 100644 (file)
--- a/src/initscripts/system/sysctl
+++ b/src/initscripts/system/sysctl
@@ -1,18 +1,23 @@
 #!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/sysctl
-#
-# Description : File uses /etc/sysctl.conf to set kernel runtime
-#               parameters
-#
-# Authors     : Nathan Coulson (nathan@linuxfromscratch.org)
-#               Matthew Burgress (matthew@linuxfromscratch.org)
-#
-# Version     : 00.00
-#
-# Notes       :
-#
-########################################################################
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 . /etc/sysconfig/rc
 . ${rc_functions}
@@ -24,13 +29,7 @@ case "${1}" in
                        sysctl -q -p
                        evaluate_retval
                fi
-               arch=`uname -m`
-               case "${arch}" in
-                       i?86 )  arch="i586";
-                               ;;
-                       armv*)  arch="armv5tel":
-                               ;;
-               esac
+               arch="$(uname -m)"
                if [ -f "/etc/sysctl-${arch}.conf" ]; then
                        boot_mesg "Setting ${arch}-kernel runtime parameters..."
                        sysctl -q -p /etc/sysctl-${arch}.conf
@@ -39,7 +38,7 @@ case "${1}" in
                ;;
 
        status)
-               sysctl -a       
+               sysctl -a
                ;;
 
        *)
@@ -47,5 +46,3 @@ case "${1}" in
                exit 1
                ;;
 esac
-
-# End $rc_base/init.d/sysctl