diff options
| author | gjb <gjb@FreeBSD.org> | 2015-07-03 06:15:54 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-07-03 06:15:54 +0000 |
| commit | 5bc952ae8d5d74946ae75984991f95d9128bd333 (patch) | |
| tree | 74c1568003e4b8f48075dc00a2783ff1c49c0f93 /release/tools | |
| parent | 4beac78e55cca1cec584da5a2a5f50470804f67e (diff) | |
| download | FreeBSD-src-5bc952ae8d5d74946ae75984991f95d9128bd333.zip FreeBSD-src-5bc952ae8d5d74946ae75984991f95d9128bd333.tar.gz | |
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
Diffstat (limited to 'release/tools')
| -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 509b046..903aa33 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} |
