From 174fe0cfce89361799076608dbf3b56a2809651d Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 3 Jul 2015 06:07:21 +0000
Subject: [PATCH] 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
---
 release/tools/arm.subr | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index c12854eee3e6..509b046eca65 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -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}