svn commit: r285082 - head/release/tools

[Glen Barber]

Author: gjb
Date: Fri Jul  3 06:15:54 2015
New Revision: 285082
URL: https://svnweb.freebsd.org/changeset/base/285082

Log:
  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

Modified:
  head/release/tools/arm.subr

Modified: head/release/tools/arm.subr
==============================================================================
--- head/release/tools/arm.subr	Fri Jul  3 06:11:54 2015	(r285081)
+++ head/release/tools/arm.subr	Fri Jul  3 06:15:54 2015	(r285082)
@@ -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}