git: 90d2f7c413f9 - main - release: amd64: Fix ISO/USB hybrid image

[Nathan Whitehorn]

On 3/28/21 6:20 AM, Emmanuel Vadot wrote:
> On Sat, 27 Mar 2021 21:21:43 -0400
> Nathan Whitehorn <nwhitehorn at freebsd.org> wrote:
>
>> Is there a reason this can't use makefs's boot-image support directly in
>> future, like hybrid systems on other architectures? It already supports
>> all the complex interleaving of partition tables with ISO9660 for other
>> schemes (e.g. MBR and APM) and could probably be extended without much
>> trouble for this.
>>
>> (I realize this isn't useful for 13.0)
>> -Nathan
>   I have no idea what the bootimage thing in makefs can do, can it
> create a gpt disk ?

I can't right now, only MBR and APM. But it doesn't look like it would 
require a ton of work to teach it GPT, and it might be more reliable in 
the long term.
-Nathan

>
>> On 3/27/21 7:08 AM, Emmanuel Vadot wrote:
>>> The branch main has been updated by manu:
>>>
>>> URL: https://cgit.FreeBSD.org/src/commit/?id=90d2f7c413f9fc4ac479fa5e91ba1de6d4ea8d45
>>>
>>> commit 90d2f7c413f9fc4ac479fa5e91ba1de6d4ea8d45
>>> Author:     Emmanuel Vadot <manu at FreeBSD.org>
>>> AuthorDate: 2021-03-27 11:04:51 +0000
>>> Commit:     Emmanuel Vadot <manu at FreeBSD.org>
>>> CommitDate: 2021-03-27 11:04:51 +0000
>>>
>>>       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 at callfortesting.org
>>>       Tested by:      Vincent Milum Jr <freebsd at darkain.com>
>>>       MFC after:      Right now
>>> ---
>>>    release/amd64/mkisoimages.sh | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> 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.
>>>
>