From owner-svn-src-stable-10@freebsd.org  Mon Nov  2 21:26:11 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FE8DA24F3F;
 Mon,  2 Nov 2015 21:26:11 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C51F1C05;
 Mon,  2 Nov 2015 21:26:11 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA2LQA0k064181;
 Mon, 2 Nov 2015 21:26:10 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA2LQAcO064179;
 Mon, 2 Nov 2015 21:26:10 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201511022126.tA2LQAcO064179@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Mon, 2 Nov 2015 21:26:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r290277 - stable/10/etc/rc.d
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Nov 2015 21:26:11 -0000

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@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# }"