svn commit: r331843 - in head/usr.sbin/makefs: . cd9660

[Glen Barber]

On Mon, Apr 09, 2018 at 04:38:38PM -0700, Benno Rice wrote:
> 
> 
> > On Apr 9, 2018, at 6:37 AM, Glen Barber <gjb at FreeBSD.org> wrote:
> 
> [snip]
> 
> > It appears this part has broken creating disc1.iso (and other ISO
> > images) for amd64.  I see the following error:
> 
> [snip]
> 
> Yep, that’s on me. I forgot to update mkisoimages.sh. Could you try the attached patch?
> 

% Index: release/amd64/mkisoimages.sh
% ===================================================================
% --- release/amd64/mkisoimages.sh	(revision 332343)
% +++ release/amd64/mkisoimages.sh	(working copy)
% @@ -38,7 +38,7 @@
%  	umount efi
%  	rmdir efi
%  	mdconfig -d -u $device
% -	bootable="-o bootimage=efi;efiboot.img -o no-emul-boot $bootable"
% +	bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable -o platformid=efi"
%  	
%  	shift
%  else

This appears to have fixed it.

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20180410/b6667739/attachment.sig>