build/vm: support bundling a ZFS image; closes #272
Flip the order of root and swap to allow VM image to grow. Hook this up in extras.conf and also retrofit a serial console for being able to test and debug in bhyve (build/boot). Omit the use of a GPT root label in the ZFS case to deal with devices names in the way that bsdinstall sets it up. It is not all that important for ZFS anyway. The setup likely needs further testing and tweaking to make sure we emulate bsdinstall zfsboot script properly to avoid future problems.
This commit is contained in:
Franco Fichtner
parent
ff2854fc4c
commit
e782af9d8a
3
Makefile
3
Makefile
|
|
@ -90,6 +90,7 @@ DEVICE?= A10
|
|||
COMSPEED?= 115200
|
||||
COMPORT?= 0x3f8
|
||||
UEFI?= arm dvd serial vga vm
|
||||
ZFS?= # empty
|
||||
GITBASE?= https://github.com/opnsense
|
||||
MIRRORS?= https://opnsense.c0urier.net \
|
||||
http://mirrors.nycbug.org/pub/opnsense \
|
||||
|
|
@ -156,7 +157,7 @@ VERBOSE_FLAGS= -x
|
|||
VERBOSE_HIDDEN= @
|
||||
.endif
|
||||
|
||||
.for _VERSION in ABI DEBUG LUA PERL PHP PYTHON RUBY VERSION
|
||||
.for _VERSION in ABI DEBUG LUA PERL PHP PYTHON RUBY VERSION ZFS
|
||||
VERSIONS+= PRODUCT_${_VERSION}=${${_VERSION}}
|
||||
.endfor
|
||||
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ Available build options are:
|
|||
* TYPE: the base name of the top package to be installed
|
||||
* UEFI: use amd64 hybrid images for said images, e.g. "vga vm"
|
||||
* VERSION: a version tag (if applicable)
|
||||
* ZFS: ZFS pool name to use for VM images
|
||||
|
||||
How to specify build options via configuration file
|
||||
---------------------------------------------------
|
||||
|
|
|
|||
64
build/vm.sh
64
build/vm.sh
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright (c) 2016-2021 Franco Fichtner <franco@opnsense.org>
|
||||
# Copyright (c) 2016-2022 Franco Fichtner <franco@opnsense.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
|
|
@ -62,8 +62,47 @@ setup_stage ${STAGEDIR} mnt
|
|||
|
||||
truncate -s ${VMSIZE} ${STAGEDIR}/${VMBASE}
|
||||
DEV=$(mdconfig -t vnode -f ${STAGEDIR}/${VMBASE})
|
||||
newfs /dev/${DEV}
|
||||
mount /dev/${DEV} ${STAGEDIR}/mnt
|
||||
|
||||
if [ -n "${PRODUCT_ZFS}" ]; then
|
||||
ZPOOL=${PRODUCT_ZFS}
|
||||
|
||||
# avoid clobbering existing pools
|
||||
for IMPORT in $(zpool import 2> /dev/null | awk '$1 == "pool:" { print $2}'); do
|
||||
if [ ${IMPORT} = ${ZPOOL} ]; then
|
||||
echo ">>> ZFS pool '${ZPOOL}' already exists"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
# 4k sector alignment
|
||||
gnop create -S 4096 ${DEV}
|
||||
|
||||
# create ZFS pool like installer would
|
||||
zpool create -R ${STAGEDIR}/mnt ${ZPOOL} ${DEV}.nop
|
||||
zfs create -o mountpoint=none ${ZPOOL}/ROOT
|
||||
zfs create -o mountpoint=/ ${ZPOOL}/ROOT/default
|
||||
zfs create -o mountpoint=/tmp -o exec=on -o setuid=off ${ZPOOL}/tmp
|
||||
zfs create -o mountpoint=/usr -o canmount=off ${ZPOOL}/usr
|
||||
zfs create ${ZPOOL}/usr/home
|
||||
zfs create -o setuid=off ${ZPOOL}/usr/ports
|
||||
zfs create ${ZPOOL}/usr/src
|
||||
zfs create -o mountpoint=/var -o canmount=off ${ZPOOL}/var
|
||||
zfs create -o exec=off -o setuid=off ${ZPOOL}/var/audit
|
||||
zfs create -o exec=off -o setuid=off ${ZPOOL}/var/crash
|
||||
zfs create -o exec=off -o setuid=off ${ZPOOL}/var/log
|
||||
zfs create -o atime=on ${ZPOOL}/var/mail
|
||||
zfs create -o setuid=off ${ZPOOL}/var/tmp
|
||||
zpool set bootfs=${ZPOOL}/ROOT/default ${ZPOOL}
|
||||
|
||||
GPTNAME=zfsboot
|
||||
ROOTFS=zfs
|
||||
else
|
||||
newfs /dev/${DEV}
|
||||
mount /dev/${DEV} ${STAGEDIR}/mnt
|
||||
|
||||
GPTNAME=gptboot
|
||||
ROOTFS=ufs/rootfs
|
||||
fi
|
||||
|
||||
setup_base ${STAGEDIR}/mnt
|
||||
|
||||
|
|
@ -77,10 +116,15 @@ setup_entropy ${STAGEDIR}/mnt
|
|||
|
||||
cat > ${STAGEDIR}/mnt/etc/fstab << EOF
|
||||
# Device Mountpoint FStype Options Dump Pass#
|
||||
/dev/gpt/rootfs / ufs rw 1 1
|
||||
EOF
|
||||
|
||||
GPTBOOT="-p freebsd-boot/bootfs:=boot/gptboot"
|
||||
if [ -z "${PRODUCT_ZFS}" ]; then
|
||||
cat >> ${STAGEDIR}/mnt/etc/fstab << EOF
|
||||
/dev/gpt/rootfs / ufs rw 1 1
|
||||
EOF
|
||||
fi
|
||||
|
||||
GPTBOOT="-p freebsd-boot/bootfs:=boot/${GPTNAME}"
|
||||
GPTDUMMY="-p freebsd-swap::512k"
|
||||
MBRBOOT="-b boot/pmbr"
|
||||
SWAPARGS=
|
||||
|
|
@ -93,7 +137,11 @@ if [ -n "${VMSWAP}" ]; then
|
|||
EOF
|
||||
fi
|
||||
|
||||
umount ${STAGEDIR}/mnt
|
||||
if [ -n "${PRODUCT_ZFS}" ]; then
|
||||
zpool export ${ZPOOL}
|
||||
else
|
||||
umount ${STAGEDIR}/mnt
|
||||
fi
|
||||
mdconfig -d -u ${DEV}
|
||||
|
||||
if [ -n "${PRODUCT_UEFI}" -a -z "${PRODUCT_UEFI%%*"${SELF}"*}" ]; then
|
||||
|
|
@ -125,7 +173,7 @@ fi
|
|||
echo -n ">>> Building vm image... "
|
||||
|
||||
(cd ${STAGEDIR}; mkimg -s gpt -f ${VMFORMAT} -o ${VMIMG} \
|
||||
${MBRBOOT} ${UEFIBOOT} ${GPTBOOT} ${GPTDUMMY} \
|
||||
-p freebsd-ufs/rootfs:=${VMBASE} ${SWAPARGS})
|
||||
${MBRBOOT} ${UEFIBOOT} ${GPTBOOT} ${GPTDUMMY} ${SWAPARGS} \
|
||||
-p freebsd-${ROOTFS}:=${VMBASE})
|
||||
|
||||
echo "done"
|
||||
|
|
|
|||
|
|
@ -122,4 +122,23 @@ vga_hook()
|
|||
vm_hook()
|
||||
{
|
||||
loader_conf_fixup ${1}
|
||||
|
||||
cat > ${1}/tmp/vm.xml << EOF
|
||||
<serialspeed>${PRODUCT_COMSPEED}</serialspeed>
|
||||
<primaryconsole>video</primaryconsole>
|
||||
<secondaryconsole>serial</secondaryconsole>
|
||||
EOF
|
||||
sed -i '' -e "/<system>/r ${1}/tmp/vm.xml" ${1}${CONFIG_XML}
|
||||
rm ${1}/tmp/vm.xml
|
||||
|
||||
echo "-S${PRODUCT_COMSPEED} -D" > ${1}/boot.config
|
||||
|
||||
cat >> ${1}/boot/loader.conf << EOF
|
||||
comconsole_speed="${PRODUCT_COMSPEED}"
|
||||
console="vidconsole,comconsole"
|
||||
boot_multicons="YES"
|
||||
boot_serial="YES"
|
||||
EOF
|
||||
|
||||
touch ${1}/.probe.for.growfs.nano
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue