The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=14e3f2d8d3eb6f47556e59bee3e2004ac9a9d7e6
commit 14e3f2d8d3eb6f47556e59bee3e2004ac9a9d7e6
Author: Jose Luis Duran <jldu...@gmail.com>
AuthorDate: 2024-04-23 21:12:45 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2024-04-23 21:13:35 +0000
nanobsd: Set a GPT label for EFI and cfg partitions
Use efiboot0 for the EFI partition, the nomenclature efiboot + #index
was taken from bsdinstall (zfsboot).
Use cfg for the cfg partition. Poudriere firmware images are already
using this label.
PR: 278480
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1187
---
tools/tools/nanobsd/embedded/common | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/tools/nanobsd/embedded/common
b/tools/tools/nanobsd/embedded/common
index 17caef798af2..bcb1061df629 100644
--- a/tools/tools/nanobsd/embedded/common
+++ b/tools/tools/nanobsd/embedded/common
@@ -293,9 +293,9 @@ create_diskimage_mbr ( ) (
# p1 is boot for uefi, p2 is boot for gpt, p3 is cfg, p4 is /
# and p5 is alt-root (after resize)
mkimg -a 2 ${fmtarg} ${bootmbr} -s gpt \
- -p efi:=${NANO_WORLDDIR}/boot/efiboot.img \
+ -p efi/efiboot0:=${NANO_WORLDDIR}/boot/efiboot.img \
-p freebsd-boot:=${NANO_WORLDDIR}/boot/gptboot \
- -p ${p3}:=${NANO_LOG}/_.p3 \
+ -p ${p3}/cfg:=${NANO_LOG}/_.p3 \
-p ${p4}:=${NANO_LOG}/_.p4 \
-o ${out}
;;
