d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test for loader.rc existence before attempting to create

Browse Source 
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:
Glen Barber 2015-07-03 06:15:54 +00:00
parent 96a11afdff
commit ef3a5d20dd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/tools/arm.subr
View File

@ -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}