From owner-svn-src-head@FreeBSD.ORG  Sun May 17 08:25:02 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C4DC71065670;
	Sun, 17 May 2009 08:25:02 +0000 (UTC)
	(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B5F278FC2B;
	Sun, 17 May 2009 08:25:02 +0000 (UTC)
	(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4H8P2Mf018676;
	Sun, 17 May 2009 08:25:02 GMT (envelope-from danger@svn.freebsd.org)
Received: (from danger@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4H8P2Qs018675;
	Sun, 17 May 2009 08:25:02 GMT (envelope-from danger@svn.freebsd.org)
Message-Id: <200905170825.n4H8P2Qs018675@svn.freebsd.org>
From: Daniel Gerzo <danger@FreeBSD.org>
Date: Sun, 17 May 2009 08:25:02 +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: r192246 - 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: Sun, 17 May 2009 08:25:03 -0000

Author: danger (doc committer)
Date: Sun May 17 08:25:02 2009
New Revision: 192246
URL: http://svn.freebsd.org/changeset/base/192246

Log:
  - do not create and mount new file systems on top of the old ones on every
    invocation of this script once we already have one
    (in case tmpmfs="YES").
  
  Reviewed by:	dougb

Modified:
  head/etc/rc.d/tmp

Modified: head/etc/rc.d/tmp
==============================================================================
--- head/etc/rc.d/tmp	Sun May 17 06:45:30 2009	(r192245)
+++ head/etc/rc.d/tmp	Sun May 17 08:25:02 2009	(r192246)
@@ -43,8 +43,10 @@ load_rc_config $name
 #
 case "${tmpmfs}" in
 [Yy][Ee][Ss])
-	mount_md ${tmpsize} /tmp "${tmpmfs_flags}"
-	chmod 01777 /tmp
+	if ! /bin/df /tmp | grep -q "^/dev/md[0-9]"; then
+		mount_md ${tmpsize} /tmp "${tmpmfs_flags}"
+		chmod 01777 /tmp
+	fi
 	;;
 [Nn][Oo])
 	;;