From owner-svn-src-head@freebsd.org  Sat Jul  4 00:01:42 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 72D0A994C0E;
 Sat,  4 Jul 2015 00:01:42 +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 6409E2B8A;
 Sat,  4 Jul 2015 00:01:42 +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 t6401gkb034880;
 Sat, 4 Jul 2015 00:01:42 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6401gMB034879;
 Sat, 4 Jul 2015 00:01:42 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201507040001.t6401gMB034879@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: Sat, 4 Jul 2015 00:01:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285114 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Sat, 04 Jul 2015 00:01:42 -0000

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}