From nobody Wed Oct 28 05:52:37 2026 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 4jDxN62mCHz6wrXD for ; Wed, 28 Oct 2026 05:52:38 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jDxN604g2z4L2C for ; Wed, 28 Oct 2026 05:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793166758; 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=5f8mH4ElIK7C3dVt96DKspiu2aydWStMqOL8s2sJ6tQ=; b=TOD/2gyCg6wv0N9luQ+q8P7xe370qLZt/mcRy+0NRkBfHQCPSH3OV+tsMs277uAN1r+AEt iPLgzYuBV2VpYmN/eZHlTAvluedMHqqbrqsybE2eGnicuOEt7b7YPoig+sausa/Xdwp9Z8 nPBKca5CUPgQOlPJFmgWs9Fu9Eqn0gkOzGiEP8U0fkQRDyli1oj4rTbOxGG+5aFNMsifva TRANCPN22I8PumOvRRE4So9WhWY5RaznjSSuExcTJgJfZbdzH/iwWPxsnOv6YofelnJ3Sl ijH3y0Q4JkYnpbGQ3YzDRa3GJvjrgX6bsEWZjHNvqJAmUnx5i8yepQK0yVQclQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793166758; b=Jkx0sw9jYQSrXUcBXjepwg3kig6QbsCab7KD1fQGCTJOgpj/0rj9xM8hrM31yABJufCkvu wAVFvR/kKrHfIcGG7vlOUC4j0YmzNvwT4wUUEgcofhAZ4nnTtvJKvU05Do6UnOsBgOPK6p 243QF6iTpj5c56mtDPJpysBqfS+dAAafCLG3Kys5VUe/1EFozYyBKBtms2rQcPXMd77fEJ +ihOjhN891LEndNpLekees6WNcV+2SY9A691KhiYwdN++F5PT+9UxhYdexauww3krvyTpi 1bqOcOKCLGbTQEfexs1yIv3niHj/fLmOWxiB9kQKHGh1/U9QwRmyymlKQEHAPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793166758; 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=5f8mH4ElIK7C3dVt96DKspiu2aydWStMqOL8s2sJ6tQ=; b=aCmXM76tFkOIrCTsdn6BAjUoMWpYoaoNoURN3ejRx4SYrLOMpCfaTfHJmV0HM0lC1jhYoD /ctMWP3sER4kZUDrF/u/cta3f3YpZy9IHd5kfeGD4jNaWp+pF6O9AZbVJFqLRdfLrwJF/c dI02fRZxFWjLD6J7iPis/dZj4LqSmj0yhgMoxE3QTQEajvqjBZoTt0iSfy2btL+gftyUu4 Vwjj8ONaQrAgWQ5RjhS4UojvZVpKLlgn8+KFUiDp4DsNHIaHLf9D4eNCuLr1xfV0PAoffg mP2M1iCNkR6Hd5BDtCxoSSkEBqUESHYtKDvipsVqwQhR4/XIll4Gnxh1bhDdFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jDxN56pswzw6q for ; Wed, 28 Oct 2026 05:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 366a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 05:52:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 97f2ecf59f8e - stable/15 - vmimage.subr: Support partition alignment List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 97f2ecf59f8e9666ab81cedb27e53246f7e14f8d Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 05:52:37 +0000 Message-Id: <6ae18da5.366a0.183bec18@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=97f2ecf59f8e9666ab81cedb27e53246f7e14f8d commit 97f2ecf59f8e9666ab81cedb27e53246f7e14f8d Author: Colin Percival AuthorDate: 2026-10-08 00:52:01 +0000 Commit: Colin Percival CommitDate: 2026-10-28 01:13:01 +0000 vmimage.subr: Support partition alignment If VM_PARTALIGN is set, pass %${VM_PARTALIGN} to mkimg in the specification of swap, config, root, and ESP partitions. (Boot partitions are not aligned, both because they're small and in case firmware makes assumptions about their locations.) Reviewed by: lwhsu, imp MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D60454 (cherry picked from commit f46269aba8a0bc2b60a0305bdafd8dfb42e0bb88) --- release/tools/vmimage.subr | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index b8d2be965dde..e7e7b9607b15 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -369,10 +369,14 @@ umount_loop() { } vm_create_disk() { - local BOOTFILES BOOTPARTSOFFSET FSPARTTYPE X86GPTBOOTFILE + local BOOTFILES BOOTPARTSOFFSET FSPARTTYPE PARTALIGN X86GPTBOOTFILE + + if [ -n "${VM_PARTALIGN}" ]; then + PARTALIGN="%${VM_PARTALIGN}" + fi if [ -z "${NOSWAP}" ]; then - SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}" + SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}${PARTALIGN}" fi if [ -n "${VM_BOOTPARTSOFFSET}" ]; then @@ -380,7 +384,7 @@ vm_create_disk() { fi if [ -n "${CONFIG_DRIVE}" ]; then - CONFIG_DRIVE="-p freebsd/config-drive::${CONFIG_DRIVE_SIZE}" + CONFIG_DRIVE="-p freebsd/config-drive::${CONFIG_DRIVE_SIZE}${PARTALIGN}" fi case "${VMFS}" in @@ -412,19 +416,19 @@ vm_create_disk() { ESP=yes BOOTPARTS="-b ${BOOTFILES}/i386/pmbr/pmbr \ -p freebsd-boot/bootfs:=${BOOTFILES}/${X86GPTBOOTFILE}${BOOTPARTSOFFSET}" - ROOTFSPART="-p ${FSPARTTYPE}/rootfs:=${VMBASE}" + ROOTFSPART="-p ${FSPARTTYPE}/rootfs:=${VMBASE}${PARTALIGN}" MAKEFSARGS="$MAKEFSARGS -B little" ;; arm:armv7 | arm64:aarch64 | riscv:riscv64*) ESP=yes BOOTPARTS= - ROOTFSPART="-p ${FSPARTTYPE}/rootfs:=${VMBASE}" + ROOTFSPART="-p ${FSPARTTYPE}/rootfs:=${VMBASE}${PARTALIGN}" MAKEFSARGS="$MAKEFSARGS -B little" ;; powerpc:powerpc*) ESP=no BOOTPARTS="-p prepboot:=${BOOTFILES}/powerpc/boot1.chrp/boot1.elf -a 1" - ROOTFSPART="-p freebsd:=${VMBASE}" + ROOTFSPART="-p freebsd:=${VMBASE}${PARTALIGN}" if [ ${TARGET_ARCH} = powerpc64le ]; then MAKEFSARGS="$MAKEFSARGS -B little" else @@ -445,7 +449,7 @@ vm_create_disk() { if [ -z "${BOOTPARTS}" ]; then espsuffix="${BOOTPARTSOFFSET}" fi - BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}${espsuffix}" + BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}${espsuffix}${PARTALIGN}" # Add this to fstab mkdir -p ${DESTDIR}/boot/efi