diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-07-03 06:15:54 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-07-03 06:15:54 +0000 |
| commit | ef3a5d20dd54935960b6d2221a19f4c2b702837d (patch) | |
| tree | 74c1568003e4b8f48075dc00a2783ff1c49c0f93 /release/tools/arm.subr | |
| parent | 96a11afdffd8dec9504f3febba5b4ba9a2f6cefd (diff) | |
| download | src-ef3a5d20dd54935960b6d2221a19f4c2b702837d.tar.gz src-ef3a5d20dd54935960b6d2221a19f4c2b702837d.zip | |
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
Notes
Notes:
svn path=/head/; revision=285082
Diffstat (limited to 'release/tools/arm.subr')
| -rw-r--r-- | release/tools/arm.subr | 7 |
1 files 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} |