Page MenuHomeFreeBSD

D60454.1794861991.diff
No OneTemporary

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D60454.1794861991.diff

diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -369,10 +369,14 @@
}
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 @@
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 @@
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 @@
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

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 16, 8:46 PM (11 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40461011
Default Alt Text
D60454.1794861991.diff (1 KB)

Event Timeline