svn commit: r290277 - stable/10/etc/rc.d

[Devin Teske]

Author: dteske
Date: Mon Nov  2 21:26:10 2015
New Revision: 290277
URL: https://svnweb.freebsd.org/changeset/base/290277

Log:
  MFC r290163: Ignore per-mdN settings in mdconfig[2] startup
  
  PR:		base/189696
  Submitted by:	ganael.laplanche at martymac.org

Modified:
  stable/10/etc/rc.d/mdconfig
  stable/10/etc/rc.d/mdconfig2
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/mdconfig
==============================================================================
--- stable/10/etc/rc.d/mdconfig	Mon Nov  2 21:21:00 2015	(r290276)
+++ stable/10/etc/rc.d/mdconfig	Mon Nov  2 21:26:10 2015	(r290277)
@@ -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# }"

Modified: stable/10/etc/rc.d/mdconfig2
==============================================================================
--- stable/10/etc/rc.d/mdconfig2	Mon Nov  2 21:21:00 2015	(r290276)
+++ stable/10/etc/rc.d/mdconfig2	Mon Nov  2 21:26:10 2015	(r290277)
@@ -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# }"