svn commit: r285078 - head/release/tools

[Glen Barber]

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}