[Midnightbsd-cvs] src [11642] trunk/etc/rc.d/sysctl: update sysctl

[laffer1 at midnightbsd.org]

Revision: 11642
          http://svnweb.midnightbsd.org/src/?rev=11642
Author:   laffer1
Date:     2018-07-08 13:50:05 -0400 (Sun, 08 Jul 2018)
Log Message:
-----------
update sysctl

Modified Paths:
--------------
    trunk/etc/rc.d/sysctl

Modified: trunk/etc/rc.d/sysctl
===================================================================
--- trunk/etc/rc.d/sysctl	2018-07-08 17:49:38 UTC (rev 11641)
+++ trunk/etc/rc.d/sysctl	2018-07-08 17:50:05 UTC (rev 11642)
@@ -8,51 +8,29 @@
 . /etc/rc.subr
 
 name="sysctl"
+command="/sbin/sysctl"
 stop_cmd=":"
 start_cmd="sysctl_start"
-reload_cmd="sysctl_start"
+reload_cmd="sysctl_start last"
 lastload_cmd="sysctl_start last"
 extra_commands="reload lastload"
 
-#
-# Read in a file containing sysctl settings and set things accordingly.
-#
-parse_file()
-{
-	if [ -f $1 ]; then
-		while read var comments
-		do
-			case ${var} in
-			\#*|'')
-				;;
-			*)
-				mib=${var%%=*}
-				val=${var#*=}
-
-				if current_value=`${SYSCTL} -n ${mib} 2>/dev/null`; then
-					case ${current_value} in
-					${val})
-						;;
-					*)
-						if ! sysctl "${var}" >/dev/null 2>&1; then
-							warn "unable to set ${var}"
-						fi
-						;;
-					esac
-				elif [ "$2" = "last" ]; then
-					warn "sysctl ${mib} does not exist."
-				fi
-				;;
-			esac
-		done < $1
-	fi
-}
-
 sysctl_start()
 {
+	case $1 in
+	last)
+		command_args="-f"
+	;;
+	*)
+		command_args="-i -f"
+	;;
+	esac
 
-	parse_file /etc/sysctl.conf $1
-	parse_file /etc/sysctl.conf.local $1
+	for _f in /etc/sysctl.conf /etc/sysctl.conf.local; do
+		if [ -r ${_f} ]; then
+			${command} ${command_args} ${_f} > /dev/null
+		fi
+	done
 }
 
 load_rc_config $name