From a6d3c7cdd5cf0fbd000592cfbcb97c788316a99d Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 3 Jul 2015 06:01:37 +0000
Subject: [PATCH] Fix the real problem with missing UFS/MSDOSFS labels on the
 FreeBSD/arm builds.  The problem stems from the loader.rc file not existing,
 as well as geom_label not being loaded at boot.

For now, add the geom_label_load entry to loader.conf, and
symlink loader.rc.sample to loader.rc, both of which allowed
my BeagleBone Black to boot fine with a UFS label reference in
fstab(5).

MFC after:	3 days
X-MFC-Before:	10.2-BETA1
Sponsored by:	The FreeBSD Foundation
---
 release/tools/arm.subr | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index d9018e97d1bf..c12854eee3e6 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -140,6 +140,11 @@ 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}/boot/loader.conf
+	# Workaround missing loader.rc if needed.
+	chroot ${CHROOTDIR} ln -s /boot/loader.rc.sample /boot/loader.rc
+
 	sync
 	umount_loop ${CHROOTDIR}/${DESTDIR}