svn commit: r285114 - head/release/tools

[Glen Barber]

Author: gjb
Date: Sat Jul  4 00:01:41 2015
New Revision: 285114
URL: https://svnweb.freebsd.org/changeset/base/285114

Log:
  Revert r285018, r285019, r285076, r285078, r285082.
  
  The true cause of the missing UFS/MSDOSFS labels has been
  identified, and only affects stable/10 at the moment.
  
  An request for commit to stable/10 will be pending RE approval
  after this commit.
  
  MFC after:	1 day
  X-MFC-Note:	never
  X-MFC-Never:	r285018, r285019, r285076, r285078, r285082
  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 22:11:07 2015	(r285113)
+++ head/release/tools/arm.subr	Sat Jul  4 00:01:41 2015	(r285114)
@@ -128,14 +128,6 @@ arm_install_base() {
 	echo 'sendmail_msp_queue_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
 	echo 'growfs_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
 
-	# The fstab(5) above uses UFS/MSDOSFS labels.
-	echo 'geom_label_load="YES"' >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
-	# Workaround missing loader.rc if needed.
-	if [ ! -e "${CHROOTDIR}/${DESTDIR}/boot/loader.rc" ]; then
-		chroot ${CHROOTDIR} \
-			ln -s /boot/loader.rc.sample ${DESTDIR}/boot/loader.rc
-	fi
-
 	sync
 	umount_loop ${CHROOTDIR}/${DESTDIR}