From nobody Fri Nov 7 05:16:52 2025 X-Original-To: dev-commits-src-branches@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 4d2nNh44Dgz652xH; Fri, 07 Nov 2025 05:16:52 +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 4d2nNh1MYfz3RMZ; Fri, 07 Nov 2025 05:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492612; 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=G8hnGlsE04LVZxRl5a2o4nS7PbZWMyhdNdHgbqJVqHs=; b=v6QTD1vtWznhiclfjt8/PQ20MK4yCSAkRPkGLBY9/RWyF2s0vvauHziuv5cx443YWFyaa/ 9MsNk8ndgGqc/7SEtOvuLPN567gvDwjTA5O4XIZRwTy/BjJsfJvGYM1KVEuPdvfeLLNn9I Xk2NK/ZrX/zgARIIrXVMN6JSXzRy7r+QBr+gwWwLowWh0lJ8ZAnk6yvo8heWnsOKu5J1oM b7I15m+ub7Lm/TS9awG0Xy2WYxoLvxZRs3bKFv9Pw+iWcJD16ImYB2+EXHKm/QuhPgTr5Q k3FYUiJLkR+D15HmL0xzFDxxaXYhD2m3OPd99tOdhbpomaus7BAfenFvU/CTkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762492612; 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=G8hnGlsE04LVZxRl5a2o4nS7PbZWMyhdNdHgbqJVqHs=; b=CNf7L/NarsiUr3eIBLvEwTFlghtPOg3Yo5Ila2UNhxLWWFyukcx7qj+OKkoyRKDMxLiQ2l Y4Qik5dWYeoDHuDk50NVIHBwPn5U7vMj2EA/7OQbblMD2ZwzLFAsd7V1MTncGEmDjwmDMT EgGinGsMjkbay5OL0rtHOy5l+//7HwBBPLuwpmin8Pm1r4XM6Qn5w+I1Xf/WT6Q+wFXuS9 DRsGTzG0DHCheVztYibVHgdP02RvjnYp4DGx14y7IjuAtdYy0JvFQKglbiDS7KkLMp+9eo hhS1JfZePgSx7TGJbpSDKH0L81Rhc8ZNs3Ljk7PxloEPQX9Y3J4lxds6xDkkWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762492612; a=rsa-sha256; cv=none; b=QuqPmMTxlBh4m6Xi0u2nlPtRco8uaMvH07tUsobD1l1qSWFGswpjy2cJrecxguweAwfmKR YZ6TymuZjL5mjE9kDwzrBdo2Usy8ruUx/2z+fDU6auUBZK8Zrt1e3kaxcPn0KVe24YvblQ nuJgX1n6ELj2XJitRppuIWrAgBkDymEzfUIvgzVZO4hO5clkYBG90uiw1QpKC4P4BLvDAR Suni+n9RUfSV8sGf7x52G6DZLoyN0D9CAxCwmsRp+JetB/2tdy93OXvn3gM3MPhQ6PHK1j rZEjSzTLtaGC7+QJ8Tjl0Gcmk7lEZnzEEBppzXt0OBAjwqlnMsiF+1IYzrhzLg== 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 4d2nNh0xjhzmTx; Fri, 07 Nov 2025 05:16:52 +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 5A75Gqef092516; Fri, 7 Nov 2025 05:16:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A75GqWY092513; Fri, 7 Nov 2025 05:16:52 GMT (envelope-from git) Date: Fri, 7 Nov 2025 05:16:52 GMT Message-Id: <202511070516.5A75GqWY092513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 58f208591b59 - releng/15.0 - release: Comply with Azure Marketplace requirements for aarch64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 58f208591b59b57ec47cd6dcaeb88991d2a1cb29 Auto-Submitted: auto-generated 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 AuthorDate: 2025-11-07 05:10:44 +0000 Commit: Colin Percival 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 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