From nobody Wed Oct 21 20:48:37 2026 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 4j91bB0jM0z6wV1M for ; Wed, 21 Oct 2026 20:48: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 4j91b95tfLz4r5V for ; Wed, 21 Oct 2026 20:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792615717; 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=Ul0I7DH7/QkRh59VpKjr8JZvNOGNt/URAARlnvI/5Ms=; b=CTrU6A5FzlZAcS+Sw/L0gBZD6gCQca8s+jd689G2i0LqsRBgS5ZqQVJ4YBAgmasNE2ahiv At02XuRyAA6E+dC+3D8XdkrFwyQKQHEttAgDheUiwqBheFNVIEXeRy+i6KVcFBKGb3lQ9A aLQig/CbeCS+gig9r+gA/TuuOsd1Uem9M90JlE4nDwiog8iynzZLZsnkEMdij9y4zytUHf 2VQFdtHTLWUNvM0u1U8GcV8797kT/TtcceKUl9t2Hq/gdoqH8EOXcBO5KYrh8W+nulEbSn cuSNRbWZmZNsBkZ4693ZnPW5RzqYgP6XQCMjXR33jvNeeCeXTazi6elwQZSNCA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792615717; b=GAYuFllFUEdPJCluHYALhxYg+NjPWa009Zz2Hj7CglbLseBTCwFtgMjUHh9MQn8Tu4MzVb XSZrQ6czglfuRIb6S98fENltU5j6UkejL6zE7sS0sEacJfDN6W+UMfRn9Y/QKYOynDdiSX YG3NZEKVqjK8RmWeGWWByOEoEkVLrAVTaAdSP4KFWD4Ye5ZoPLDWQ/11ctsDT5EPTr7EBC GQuREHWmuIHcmJB1ofN7TqPdJddyKthojWw0EMzxX4pB7I1TyyBuIcHAkBfy1lpsTR8okZ Z4D3/dDEEfSLQzyO21+jpbhzhCZCFzfsd8ED1aO4rA/hJ9/y2sfHWhg/FI1jGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792615717; 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=Ul0I7DH7/QkRh59VpKjr8JZvNOGNt/URAARlnvI/5Ms=; b=k//WmlQop3yZr9AqgqNetEqG+OAuE97v70BMYbqSGZzWU1Y/fiBrjkXFsmK5CWWuwgkBfy +Dp5cowdk5Er37dNwviDt8UbqW/XCUQ95chMQ9biYiZhjr53Cv6EgE9fDeBmxYNVJbLiNu VGCx3FRM17a1nUYAjsD9Mep3/wG1tT7cLaAeL0dVu9hrr5tvYJZgFxX5ciUAQR57lW5L69 NACo4LaIXjWJLKPXqF6ur9xCPuDDffQXsHKkII/AC4AbBd7Z2p0b8LGExBSzRoA6Cjo8i7 rwkxcstJ8b6x3nw9CVVBbNiuNoqXHI0ujkTuu3GKzyuMjYBvEnXkgdDUMj3q6g== 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 4j91b95YQQz19LN for ; Wed, 21 Oct 2026 20:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f612 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Oct 2026 20:48:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: f46269aba8a0 - main - vmimage.subr: Support partition alignment List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the 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/main X-Git-Reftype: branch X-Git-Commit: f46269aba8a0bc2b60a0305bdafd8dfb42e0bb88 Auto-Submitted: auto-generated Date: Wed, 21 Oct 2026 20:48:37 +0000 Message-Id: <6ad92525.1f612.535e77f9@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f46269aba8a0bc2b60a0305bdafd8dfb42e0bb88 commit f46269aba8a0bc2b60a0305bdafd8dfb42e0bb88 Author: Colin Percival AuthorDate: 2026-10-08 00:52:01 +0000 Commit: Colin Percival CommitDate: 2026-10-21 20:40:37 +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 --- 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