aboutsummaryrefslogtreecommitdiff
path: root/release/amd64
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2021-03-27 11:04:51 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2021-03-27 11:04:51 +0000
commit90d2f7c413f9fc4ac479fa5e91ba1de6d4ea8d45 (patch)
treee3e217f4cfac7ee26f6ed6877b57cdbdf2a8534e /release/amd64
parent6f43c72b472ee78e04f1ebd347ca0ae7787ee876 (diff)
downloadsrc-90d2f7c413f9fc4ac479fa5e91ba1de6d4ea8d45.tar.gz
src-90d2f7c413f9fc4ac479fa5e91ba1de6d4ea8d45.zip
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
Diffstat (limited to 'release/amd64')
-rw-r--r--release/amd64/mkisoimages.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh
index 1a1440fa1983..a9e8a2c04392 100644
--- a/release/amd64/mkisoimages.sh
+++ b/release/amd64/mkisoimages.sh
@@ -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.