Ignore per-mdN settings in mdconfig[2] startup

PR:		base/189696
Submitted by:	ganael.laplanche@martymac.org
MFC after:	3 days
X-MFC-to:	stable/10 stable/9

diff --git a/etc/rc.d/mdconfig b/etc/rc.d/mdconfig
index 627da8750b24d580795cdd23d1be2194f18d4b06..fecdef675d7573e0731751c4235394390a32d1d1 100755 (executable)
--- a/etc/rc.d/mdconfig
+++ b/etc/rc.d/mdconfig
@@ -186,6 +186,8 @@ if [ -z "${_mdconfig_list}" ]; then
                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# }"

diff --git a/etc/rc.d/mdconfig2 b/etc/rc.d/mdconfig2
index 85fd07fc3fe211ef8b68c6b88ead3692a2ab635b..234459f137f3b2247fd909af610bbe74112d5989 100755 (executable)
--- a/etc/rc.d/mdconfig2
+++ b/etc/rc.d/mdconfig2
@@ -216,6 +216,8 @@ if [ -z "${_mdconfig2_list}" ]; then
                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# }"