diff options
| author | gjb <gjb@FreeBSD.org> | 2018-06-08 14:35:27 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2018-06-08 14:35:27 +0000 |
| commit | 81ff2107547ff56f129cd83ea3df576b1050a820 (patch) | |
| tree | 161a46bf250c50d9d6a436576f354d69654c538e /release | |
| parent | 6b7165ba179f7bdf7c120bb39ef1b55bf7a7cbbd (diff) | |
| download | FreeBSD-src-81ff2107547ff56f129cd83ea3df576b1050a820.zip FreeBSD-src-81ff2107547ff56f129cd83ea3df576b1050a820.tar.gz | |
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
Diffstat (limited to 'release')
| -rw-r--r-- | release/amd64/mkisoimages.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh index 153f31f6..cb3d130 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 |
