release: amd64: Fix ISO/USB hybrid image

Recent mkimg changes forces to have partitions given in explicit order.
This is so we can have the first partition starting at a specific offset
and the next ones starting after without having to specify an offset.
Switch the partition in the mkisoimage.sh script so the first one created
is the isoboot one.

PR:    254490
Reported by:	Michael Dexter <editor@callfortesting.org
Tested by:	Vincent Milum Jr <freebsd@darkain.com>
MFC after:	Right now
This commit is contained in:
Emmanuel Vadot 2021-03-27 12:04:51 +01:00
parent 6f43c72b47
commit 90d2f7c413

View File

@ -89,8 +89,8 @@ if [ "$bootable" != "" ]; then
$MKIMG -s gpt \
--capacity $imgsize \
-b "$BASEBITSDIR/boot/pmbr" \
$espparam \
-p freebsd-boot:="$BASEBITSDIR/boot/isoboot" \
$espparam \
-o hybrid.img
# Drop the PMBR, GPT, and boot code into the System Area of the ISO.