svn commit: r334839 - releng/11.2/release/amd64

[Glen Barber]

Author: gjb
Date: Fri Jun  8 14:35:27 2018
New Revision: 334839
URL: https://svnweb.freebsd.org/changeset/base/334839

Log:
  Restore r332345 and r332346 from head, merged to stable/11 as
  part of r333006, which was reverted in r334735.
  
  r332345 fixes makefs(8) invocation after head revision r331843,
  where makefs(8) was updated to be in sync with NetBSD.
  
  r332346 fixes the $bootable variable position so the platformid
  option is correctly applied.
  
  This is a direct commit to releng/11.2, as these two revisions
  were part of a total of four revisions merge to stable/11 (at
  the time) in r333006.
  
  Approved by:	re (bdrewery)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/11.2/release/amd64/mkisoimages.sh

Modified: releng/11.2/release/amd64/mkisoimages.sh
==============================================================================
--- releng/11.2/release/amd64/mkisoimages.sh	Fri Jun  8 14:00:12 2018	(r334838)
+++ releng/11.2/release/amd64/mkisoimages.sh	Fri Jun  8 14:35:27 2018	(r334839)
@@ -38,7 +38,7 @@ if [ "x$1" = "x-b" ]; then
 	umount efi
 	rmdir efi
 	mdconfig -d -u $device
-	bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable"
+	bootable="-o bootimage=i386;efiboot.img -o no-emul-boot -o platformid=efi $bootable"
 	
 	shift
 else