From nobody Sat Nov 08 17:25:34 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 4d3jW30sw9z6GJc4; Sat, 08 Nov 2025 17:25:35 +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 4d3jW26wh3z3f7b; Sat, 08 Nov 2025 17:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762622735; 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=iJbwB7uNrMT2YTcHAyAGjxbnxahunTzdtyNag0DeSgE=; b=Wj2hA6IFod5E6F7LUso2KRa+E2QHZW7m/xodnuKQteHs2gIIXcpHDWayp4JilpcoP5/NqK x0kvwpjaqfx1+JKrgoWc3AsGnjkDydN8b8SQuIwSrd5CFLYw7JBKXqHkRERFHEo4yiVgkH u/5jxICY2/tMf2PzVzjYoHns0VP4KG1VwHLgXBujNqg90lFZ4OKTGrMVkKEErCXKn7jUO+ dpB+pBochrnEaUe8Z+v1dR53yO+sRtCJvoXe+fboBgD2wUM0gCpYGmOv1X1ELmKT61QB2p HLJy24zQJaVjj4FAkM5XPP5PW5tE2ifQA/DiZr+l4dxhxBhIBnG0VcR6pWEL0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762622735; 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=iJbwB7uNrMT2YTcHAyAGjxbnxahunTzdtyNag0DeSgE=; b=ckD3m8dfI3ZsBKbHGMcUm5kVLZLHyC5E/fy/DlvCxXxfWj+aDiQ3OBMLuyBAoHPUciYVqz CkrLwCccTI1KeNmsuzshtVhFHiZ9Dlrib6zbLlmnoCoStaYr1dcCLh+koeHExpwN+APaLB zENYjXBO76O9VXf88f3iVCsIE2D+l8SwQqqOMo2LM/o8+BdoiZ1AF8BTroHJlk2M6QiJ21 QrBiQRVn5CGK3l9TSPNHirKT3B8M9X6GE6kfIXw1cxPNH39HbGv9VobIxgHtD1j9Q5P2zU 4C3kPqZDzOvDzMgf1//WejG8pSCi/X2KjdxmB1F4yHhj77wwTz7Uc94zHIsj0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762622735; a=rsa-sha256; cv=none; b=W9Hfsqus93uLqUHoU6y8UmGVe4ptTnkEZexIHopXA0GARXsCEEONhrMSQHcra7u7mS3jtw d56mdre2V9DBqRyI5x6Ggb5lxWpSZXSdYRJN3xfnVqzAMj8CPxP1unQFImZp3BE8ocPjIZ rEUgcQLiM9tIIkm0vWxAN/Js7RADY6q08hR/F2JC+NsedekHtPK7fqWzA4LIdrrTMLyn+v qq1tjz6MYnAy17/1tge1Fl8Wi3esULnBuo98RQYh/ZuoHWyXfP1kco/X1dE0Uwcmzh7ZCK P3LqdGkK1PDpTIGXmR50QWkxiER2JYAOUK51zjhIp2t6R1tQ2P2/J6PQwgG3ag== 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 4d3jW26HWJzvvk; Sat, 08 Nov 2025 17:25:34 +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 5A8HPYFb085811; Sat, 8 Nov 2025 17:25:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8HPYRF085808; Sat, 8 Nov 2025 17:25:34 GMT (envelope-from git) Date: Sat, 8 Nov 2025 17:25:34 GMT Message-Id: <202511081725.5A8HPYRF085808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: fc5a01f8e9ea - stable/14 - 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc5a01f8e9eace6a6fa7a0c98a70f878f4e196ea Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=fc5a01f8e9eace6a6fa7a0c98a70f878f4e196ea commit fc5a01f8e9eace6a6fa7a0c98a70f878f4e196ea Author: Li-Wen Hsu AuthorDate: 2025-11-07 05:10:44 +0000 Commit: Li-Wen Hsu CommitDate: 2025-11-08 17:25:00 +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 (cherry picked from commit 36095c942031f7f1613eec554f1c7615cbd891fd) --- 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 04c0d5bb2bb5..7a078e357adf 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -304,7 +304,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/efiesp:=${espfilename}" + espsuffix="" + if [ -z "${BOOTPARTS}" ]; then + espsuffix="${BOOTPARTSOFFSET}" + fi + BOOTPARTS="${BOOTPARTS} -p efi/efiesp:=${espfilename}${espsuffix}" # Add this to fstab mkdir -p ${DESTDIR}/boot/efi