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
This commit is contained in:
parent
96a11afdff
commit
ef3a5d20dd
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=285082
@ -129,9 +129,12 @@ arm_install_base() {
|
|||||||
echo 'growfs_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
|
echo 'growfs_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
|
||||||
|
|
||||||
# The fstab(5) above uses UFS/MSDOSFS labels.
|
# 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.
|
# 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
|
sync
|
||||||
umount_loop ${CHROOTDIR}/${DESTDIR}
|
umount_loop ${CHROOTDIR}/${DESTDIR}
|
||||||
|
Loading…
Reference in New Issue
Block a user