From nobody Fri Nov 07 05:12:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d2nH50qkrz651mb; Fri, 07 Nov 2025 05:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2nH50Kwkz3Q3w; Fri, 07 Nov 2025 05:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GKIaWPqQ0LcJvlrDNiF01uqYRyyFgMweBFY+azGJ4pY=; b=gd1rJEFu+Z0KukNow9cq5triRTZ2w+zMKlMiHOyyTqdw2hrOTa45pMJPPFs4x1vrnh8o/u e5r2i4ZEzAu1J2Z9ZtRYU5+Xqjou80sbx4QHaHHXpNwHqcwbGHUPM830ljoqwduh2Q4p60 Ew36dO3ZNeEcEMVwJDTYoTOUK/OQKL/ciR1jt/0ZMTTtjR1zdHkwOvf3B/WYTyX+hqSc4M QW435Hbm/9x9vphSGXsLxTyW/CNv9Sel8bsF5fifVnckOwroXI3b7RmRoZORYW/XsaKn2C Zr5NXg01bozOfTEpAvdXrP6mbTVLp/08YtCxD7JZbQ1rTgIAdQdaVJm6e1OA4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GKIaWPqQ0LcJvlrDNiF01uqYRyyFgMweBFY+azGJ4pY=; b=Nn47EyPemP+pUO+BM8vVmkjB5AXS4VGz0al9nqxff/+s5Op1t1nHyJrmpglxCVW2q9iqix NT0YypHtxUJm0qi9GckB9TyMISWzoPP8lFtAeECcT2W2a13MrVg9WfEC13Y5+A2v44FVP/ KFqEWGD8l3KHsWNIavbXk4UvmxtfLfQXtJAIILT3ZbFZFo/PJ2g5UR2CHhRBvNnj39xvA9 Ym0lcBO7PMjvKf/scAqyP5eBV4KamxLT914O8Ml4c+MensUR9JzLakTBYqA405xGUsGPzi aOGaVQKaSWVetZo+7Nzul7A6aOPQ0kqGRWVQC6qMNG4upOXMxyjzan5WTtCEiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492321; a=rsa-sha256; cv=none; b=SXX+6hkpTeeAfCTCCIruxp4qCRnDaGOgawdqaHTVrMrBF/txJWkKDaMRpPUgY7H1ErEGI8 bIuDX+QGUqrvTng12aQH7OkGWXXVqU9OK/kNOPy5mnFkSCUtcUWIsIO8QzQskfJs9JPWCj F81JaEgqiWzK390ixF1OCl1mabN4mD0/L2bNZvoElvc3kUDeqOPxN1EwjrQbdqOQ7IBHVl 3HFq9Wm8DoM7XMOD8f/gHjAVkhT72kXE5aswyFQ1nInCT2yV9+AhwnQrwvN00NdnAv0tin zH2HRBJ6u1K3GGCDfcRvaaSmpUQgb3WnIprFJr7z5yWqY6dQ7GswHOFNI8aObA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2nH472Ylzm1G; Fri, 07 Nov 2025 05:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A75C0lJ089480; Fri, 7 Nov 2025 05:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75C0eB089477; Fri, 7 Nov 2025 05:12:00 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:12:00 GMT Message-Id: <202511070512.5A75C0eB089477@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 36095c942031 - main - release: Comply with Azure Marketplace requirements for aarch64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36095c942031f7f1613eec554f1c7615cbd891fd Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=36095c942031f7f1613eec554f1c7615cbd891fd commit 36095c942031f7f1613eec554f1c7615cbd891fd Author: Li-Wen Hsu AuthorDate: 2025-11-07 05:10:44 +0000 Commit: Li-Wen Hsu CommitDate: 2025-11-07 05:10:44 +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 Approved by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53628 --- 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