From owner-svn-src-all@freebsd.org  Fri Jul  3 06:15:55 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 0CE5099243F;
 Fri,  3 Jul 2015 06:15:55 +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 F228E27A7;
 Fri,  3 Jul 2015 06:15:54 +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 t636Fshe091503;
 Fri, 3 Jul 2015 06:15:54 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t636Fs7t091502;
 Fri, 3 Jul 2015 06:15:54 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201507030615.t636Fs7t091502@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: Fri, 3 Jul 2015 06:15:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285082 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jul 2015 06:15:55 -0000

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}