From 81ff2107547ff56f129cd83ea3df576b1050a820 Mon Sep 17 00:00:00 2001 From: gjb Date: Fri, 8 Jun 2018 14:35:27 +0000 Subject: [PATCH] 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 --- 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 153f31f6c7b..cb3d130a733 100644 --- a/release/amd64/mkisoimages.sh +++ b/release/amd64/mkisoimages.sh @@ -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 -- 2.45.0