git: 58f208591b59 - releng/15.0 - release: Comply with Azure Marketplace requirements for aarch64

The branch releng/15.0 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=58f208591b59b57ec47cd6dcaeb88991d2a1cb29

commit 58f208591b59b57ec47cd6dcaeb88991d2a1cb29
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2025-11-07 05:10:44 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-11-07 05:15:59 +0000

    release: Comply with Azure Marketplace requirements for aarch64
    
    Azure requires the first 1 MB (2,048 sectors) of the OS disk to remain
    empty for VM images:
    
      https://learn.microsoft.com/partner-center/marketplace-offers/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space
    
    Also append the BOOTPARTSOFFSET suffix for aarch64 images, which only
    has an ESP partition for booting.
    
    Co-authored-by: Brad Davis <brd@FreeBSD.org>
    Approved by:    re (cperciva)
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D53628
    
    (cherry picked from commit 36095c942031f7f1613eec554f1c7615cbd891fd)
    (cherry picked from commit 72617603a28fb19d45b1aac380f998c4551d5f72)
---
 release/tools/vmimage.subr | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 8531e9b8f2d6..92f00f9cf7c3 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -449,7 +449,11 @@ vm_create_disk() {
 		# Create an ESP
 		espfilename=$(mktemp /tmp/efiboot.XXXXXX)
 		make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi
-		BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}"
+		espsuffix=""
+		if [ -z "${BOOTPARTS}" ]; then
+			espsuffix="${BOOTPARTSOFFSET}"
+		fi
+		BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}${espsuffix}"
 
 		# Add this to fstab
 		mkdir -p ${DESTDIR}/boot/efi