SQUASH

http/installerconfig

@@ -74,5 +74,8 @@ echo 'vagrant' | pw usermod root -h 0
 # The console is not interactive, so we might as well boot quickly
 sysrc -f /boot/loader.conf autoboot_delay=-1
 
+# Save file system type
+echo "$FILESYSTEM" > /tmp/fstyp
+
 # Reboot
 shutdown -r now

scripts/pkgbase.sh

@@ -42,7 +42,23 @@ rm -f /usr/sbin/freebsd-update
 
 # Upgrade boot partition
 fetch -o /tmp https://raw.githubusercontent.com/freebsd/freebsd-src/main/tools/boot/install-boot.sh
-sh /tmp/install-boot.sh
+GEOM=""
+if [ -e /dev/ada0 ]; then
+	GEOM=ada0 # ATA (VirtualBox)
+fi
+if [ -e /dev/da0 ]; then
+	GEOM=da0 # SCSI (VMWare)
+fi
+if [ -e /dev/vtbd0 ]; then
+	GEOM=vtbd0 # VirtIO (QEMU)
+fi
+
+if [ -n $GEOM ]; then
+	echo "$FILESYSTEM" # XXX JL
+	cat /tmp/fstyp # XXX JL
+	sh /tmp/install-boot.sh -b legacy -f 'zfs' -s gpt "$GEOM"
+fi
 
 # XXX Change root's password to vagrant (again)
+# pkgbase overwrites master.passwd
 echo 'vagrant' | pw usermod root -h 0