From owner-svn-src-head@FreeBSD.ORG  Fri Jul 13 20:11:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6AB881065676;
	Fri, 13 Jul 2012 20:11:00 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 55C638FC17;
	Fri, 13 Jul 2012 20:11:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6DKB0ns087536;
	Fri, 13 Jul 2012 20:11:00 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6DKB0El087534;
	Fri, 13 Jul 2012 20:11:00 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201207132011.q6DKB0El087534@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 13 Jul 2012 20:11:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238427 - head/etc/rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Jul 2012 20:11:00 -0000

Author: brooks
Date: Fri Jul 13 20:10:59 2012
New Revision: 238427
URL: http://svn.freebsd.org/changeset/base/238427

Log:
  MFP4 214344:
  Tighten the regular expression that checks for an md /tmp such that
  no /tmp mount and an md / isn't improperly matched.
  
  Sponsored by:	DARPA/AFRL

Modified:
  head/etc/rc.d/tmp

Modified: head/etc/rc.d/tmp
==============================================================================
--- head/etc/rc.d/tmp	Fri Jul 13 15:25:10 2012	(r238426)
+++ head/etc/rc.d/tmp	Fri Jul 13 20:10:59 2012	(r238427)
@@ -39,7 +39,7 @@ load_rc_config $name
 
 mount_tmpmfs()
 {
-	if ! /bin/df /tmp | grep -q "^/dev/md[0-9]"; then
+	if ! /bin/df /tmp | grep -q "^/dev/md[0-9].* /tmp"; then
 		mount_md ${tmpsize} /tmp "${tmpmfs_flags}"
 		chmod 01777 /tmp
 	fi