Only install the boot loader if it actually exists. This is a stop-gap
change, since larger changes to use geom more exclusively to create partitions is in th works.
This commit is contained in:
parent
c6cb86cc6a
commit
e535d017c0
@ -581,8 +581,14 @@ create_i386_diskimage ( ) (
|
||||
fdisk ${MD}
|
||||
# XXX: params
|
||||
# XXX: pick up cached boot* files, they may not be in image anymore.
|
||||
boot0cfg -B -b ${NANO_WORLDDIR}/${NANO_BOOTLOADER} ${NANO_BOOT0CFG} ${MD}
|
||||
bsdlabel -w -B -b ${NANO_WORLDDIR}/boot/boot ${MD}s1
|
||||
if [ -f ${NANO_WORLDDIR}/${NANO_BOOTLOADER} ]; then
|
||||
boot0cfg -B -b ${NANO_WORLDDIR}/${NANO_BOOTLOADER} ${NANO_BOOT0CFG} ${MD}
|
||||
fi
|
||||
if [ -f ${NANO_WORLDDIR}/boot/boot ]; then
|
||||
bsdlabel -w -B -b ${NANO_WORLDDIR}/boot/boot ${MD}s1
|
||||
else
|
||||
bsdlabel -w ${MD}s1
|
||||
fi
|
||||
bsdlabel ${MD}s1
|
||||
|
||||
# Create first image
|
||||
|
Loading…
x
Reference in New Issue
Block a user