From fb7ff0042984f0d66463636645fc44441c4123d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cochard-Labb=C3=A9?= Date: Thu, 4 Apr 2024 22:43:29 +0200 Subject: [PATCH 1/2] Set a GPT label for EFI partition This allow to easly update the EFI loader and sync with a standard FreeBSD install. --- src/share/poudriere/image_firmware.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/share/poudriere/image_firmware.sh b/src/share/poudriere/image_firmware.sh index d9a518893a..04274eec45 100644 --- a/src/share/poudriere/image_firmware.sh +++ b/src/share/poudriere/image_firmware.sh @@ -134,7 +134,7 @@ firmware_generate() espfilename=$(mktemp /tmp/efiboot.XXXXXX) make_esp_file ${espfilename} ${ESP_SIZE} ${WRKDIR}/world/boot/loader.efi mkimg -s gpt -C ${IMAGESIZE} -b ${mnt}/boot/pmbr \ - -p efi:=${espfilename} \ + -p efi/efiboot:=${espfilename} \ -p freebsd-boot:=${mnt}/boot/gptboot \ -p freebsd-ufs/${IMAGENAME}1:=${WRKDIR}/raw.img \ -p freebsd-ufs/${IMAGENAME}2:=${WRKDIR}/raw.img \ From fe1c603e18abb51cba8695e8c43390c0e933cbd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cochard-Labb=C3=A9?= Date: Tue, 23 Apr 2024 16:36:35 +0200 Subject: [PATCH 2/2] Update image_firmware.sh Use exact same label as with bsdinstaller --- src/share/poudriere/image_firmware.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/share/poudriere/image_firmware.sh b/src/share/poudriere/image_firmware.sh index 04274eec45..fb62062351 100644 --- a/src/share/poudriere/image_firmware.sh +++ b/src/share/poudriere/image_firmware.sh @@ -134,7 +134,7 @@ firmware_generate() espfilename=$(mktemp /tmp/efiboot.XXXXXX) make_esp_file ${espfilename} ${ESP_SIZE} ${WRKDIR}/world/boot/loader.efi mkimg -s gpt -C ${IMAGESIZE} -b ${mnt}/boot/pmbr \ - -p efi/efiboot:=${espfilename} \ + -p efi/efiboot0:=${espfilename} \ -p freebsd-boot:=${mnt}/boot/gptboot \ -p freebsd-ufs/${IMAGENAME}1:=${WRKDIR}/raw.img \ -p freebsd-ufs/${IMAGENAME}2:=${WRKDIR}/raw.img \