[Midnightbsd-cvs] src [11694] trunk/etc/rc.d: update mdconfig scripts

[laffer1 at midnightbsd.org]

Revision: 11694
          http://svnweb.midnightbsd.org/src/?rev=11694
Author:   laffer1
Date:     2018-07-08 16:36:44 -0400 (Sun, 08 Jul 2018)
Log Message:
-----------
update mdconfig scripts

Modified Paths:
--------------
    trunk/etc/rc.d/mdconfig
    trunk/etc/rc.d/mdconfig2

Modified: trunk/etc/rc.d/mdconfig
===================================================================
--- trunk/etc/rc.d/mdconfig	2018-07-08 20:32:55 UTC (rev 11693)
+++ trunk/etc/rc.d/mdconfig	2018-07-08 20:36:44 UTC (rev 11694)
@@ -25,10 +25,9 @@
 # SUCH DAMAGE.
 #
 # $MidnightBSD$
-#
 
 # PROVIDE: mdconfig
-# REQUIRE: localswap root
+# REQUIRE: swap root
 
 . /etc/rc.subr
 
@@ -181,17 +180,16 @@
 
 load_rc_config $name
 
-_mdconfig_unit=0
 if [ -z "${_mdconfig_list}" ]; then
-	while :; do
-		eval _mdconfig_config=\$mdconfig_md${_mdconfig_unit}
-		if [ -z "${_mdconfig_config}" ]; then
-			break
-		else
-			_mdconfig_list="${_mdconfig_list}${_mdconfig_list:+ }md${_mdconfig_unit}"
-			_mdconfig_unit=$((${_mdconfig_unit} + 1))
-		fi
+	for _mdconfig_config in `list_vars mdconfig_md[0-9]\* |
+		sort_lite -nk1.12`
+	do
+		_mdconfig_unit=${_mdconfig_config#mdconfig_md}
+		[ "${_mdconfig_unit#*[!0-9]}" = "$_mdconfig_unit" ] ||
+			continue
+		_mdconfig_list="$_mdconfig_list md$_mdconfig_unit"
 	done
+	_mdconfig_list="${_mdconfig_list# }"
 fi
 
 run_rc_command "${_mdconfig_cmd}"

Modified: trunk/etc/rc.d/mdconfig2
===================================================================
--- trunk/etc/rc.d/mdconfig2	2018-07-08 20:32:55 UTC (rev 11693)
+++ trunk/etc/rc.d/mdconfig2	2018-07-08 20:36:44 UTC (rev 11694)
@@ -24,7 +24,6 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/mdconfig2,v 1.4 2006/12/31 10:37:18 yar Exp $
 # $MidnightBSD$
 
 # PROVIDE: mdconfig2
@@ -49,7 +48,7 @@
 		*" ${_mp} "*read-only*)
 			echo "yes"
 			;;
-		
+
 		*)
 			;;
 		esac;
@@ -211,17 +210,16 @@
 
 load_rc_config $name
 
-_mdconfig2_unit=0
 if [ -z "${_mdconfig2_list}" ]; then
-	while :; do
-		eval _mdconfig2_config=\$mdconfig_md${_mdconfig2_unit}
-		if [ -z "${_mdconfig2_config}" ]; then
-			break
-		else
-			_mdconfig2_list="${_mdconfig2_list}${_mdconfig2_list:+ }md${_mdconfig2_unit}"
-			_mdconfig2_unit=$((${_mdconfig2_unit} + 1))
-		fi
+	for _mdconfig2_config in `list_vars mdconfig_md[0-9]\* |
+		sort_lite -nk1.12`
+	do
+		_mdconfig2_unit=${_mdconfig2_config#mdconfig_md}
+		[ "${_mdconfig2_unit#*[!0-9]}" = "$_mdconfig2_unit" ] ||
+			continue
+		_mdconfig2_list="$_mdconfig2_list md$_mdconfig2_unit"
 	done
+	_mdconfig2_list="${_mdconfig2_list# }"
 fi
-	
+
 run_rc_command "${_mdconfig2_cmd}"