From owner-svn-src-all@freebsd.org  Fri Jul  3 06:07:22 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 900E099227E;
 Fri,  3 Jul 2015 06:07:22 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 815BA1F89;
 Fri,  3 Jul 2015 06:07:22 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6367MJc086041;
 Fri, 3 Jul 2015 06:07:22 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6367MF6086040;
 Fri, 3 Jul 2015 06:07:22 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201507030607.t6367MF6086040@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 3 Jul 2015 06:07:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285078 - head/release/tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jul 2015 06:07:22 -0000

Author: gjb
Date: Fri Jul  3 06:07:21 2015
New Revision: 285078
URL: https://svnweb.freebsd.org/changeset/base/285078

Log:
  Revert r285018 and r285019, which attempted to resolve
  UFS/MSDOSFS label issues on FreeBSD/arm builds, however
  the real problem was addressed in r285076, which is due
  to two separate issues, unrelated to md(4) stale device
  existence.
  
  MFC after:	3 days
  X-MFC-With:	r285076
  X-MFC-Before:	10.2-BETA1
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/tools/arm.subr

Modified: head/release/tools/arm.subr
==============================================================================
--- head/release/tools/arm.subr	Fri Jul  3 06:06:44 2015	(r285077)
+++ head/release/tools/arm.subr	Fri Jul  3 06:07:21 2015	(r285078)
@@ -63,18 +63,6 @@ umount_loop() {
 }
 
 arm_create_disk() {
-	# XXX: This is potentially dangerous, but works around an issue
-	#      properly labeling md(4) devices when the label already
-	#      exists.
-	#      EVERYTHINGISFINE should *never* be set for non-RE use.
-	#      Trust me.  I'm an engineer.
-	if [ ! -z "${EVERYTHINGISFINE}" ]; then
-		for _label in ufs/rootfs msdosfs/MSDOSBOOT; do
-			if [ -e "/dev/${_label}" ]; then
-				rm /dev/${_label}
-			fi
-		done
-	fi
 	# Create the target raw file and temporary work directory.
 	chroot ${CHROOTDIR} gpart create -s ${PART_SCHEME} ${mddev}
 	chroot ${CHROOTDIR} gpart add -t '!12' -a 63 -s ${FAT_SIZE} ${mddev}