From ef3a5d20dd54935960b6d2221a19f4c2b702837d Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 3 Jul 2015 06:15:54 +0000
Subject: [PATCH] Test for loader.rc existence before attempting to create the
 symlink from loader.rc.sample.

Fix paths relative to the CHROOTDIR.

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

diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 509b046eca65..903aa33fd129 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -129,9 +129,12 @@ arm_install_base() {
 	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
+	echo 'geom_label_load="YES"' >> ${CHROOTDIR}/${DESTDIR}/boot/loader.conf
 	# Workaround missing loader.rc if needed.
-	chroot ${CHROOTDIR} ln -s /boot/loader.rc.sample /boot/loader.rc
+	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}