diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh
index ca6a359affbd..dfd91f43140d 100755
--- a/release/scripts/mk-vmimage.sh
+++ b/release/scripts/mk-vmimage.sh
@@ -1,114 +1,115 @@
 #!/bin/sh
 #-
 # Copyright (c) 2014, 2015 The FreeBSD Foundation
 #
 # This software was developed by Glen Barber under sponsorship
 # from the FreeBSD Foundation.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # mk-vmimage.sh: Create virtual machine disk images in various formats.
 #
 #
 
 usage() {
 	echo "${0} usage:"
 	echo "${@}"
 	return 1
 }
 
 main() {
 	local arg
 	VMCONFIG="/dev/null"
 	while getopts "C:c:d:F:f:i:o:s:S:" arg; do
 		case "${arg}" in
 			C)
 				VMBUILDCONF="${OPTARG}"
 				;;
 			c)
 				VMCONFIG="${OPTARG}"
 				;;
 			d)
 				DESTDIR="${OPTARG}"
 				;;
 			F)
 				VMFS="${OPTARG}"
 				;;
 			f)
 				VMFORMAT="${OPTARG}"
 				;;
 			i)
 				VMBASE="${OPTARG}"
 				;;
 			o)
 				VMIMAGE="${OPTARG}"
 				;;
 			s)
 				VMSIZE="${OPTARG}"
 				;;
 			S)
 				WORLDDIR="${OPTARG}"
 				;;
 			*)
 				;;
 		esac
 	done
 	shift $(( ${OPTIND} - 1))
 
 	if [ -z "${VMBASE}" -o \
 		-z "${WORLDDIR}" -o \
 		-z "${DESTDIR}" -o \
 		-z "${VMSIZE}" -o \
 		-z "${VMIMAGE}" -o \
 		-z "${VMFS}" ];
 	then
 		usage || exit 0
 	fi
 
 	if [ -z "${VMBUILDCONF}" ] || [ ! -e "${VMBUILDCONF}" ]; then
 		echo "Must provide the path to vmimage.subr."
 		return 1
 	fi
 
 	. "${VMBUILDCONF}"
 
 	if [ ! -z "${VMCONFIG}" ] && [ ! -c "${VMCONFIG}" ]; then
 		. "${VMCONFIG}"
 	fi
 
 	vm_create_base
 	vm_install_base
+	vm_emulation_setup
 	vm_extra_install_base
 	vm_extra_install_packages
 	vm_extra_install_ports
 	vm_extra_enable_services
 	vm_extra_pre_umount
 	vm_extra_pkg_rmcache
-	cleanup
+	vm_emulation_cleanup
 	vm_copy_base
 	vm_create_disk || return 0
 	vm_extra_create_disk
 
 	return 0
 }
 
 main "$@"
diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index b6526f21e474..9da2b19de694 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -1,59 +1,57 @@
 #!/bin/sh
 #
 #
 
 # Convention of Linux type VM on Azure is 30G
 export VMSIZE=30g
 
 # Set to a list of packages to install.
 export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-freebsd-update firstboot-pkgs"
 
 # Set to a list of third-party software to enable in rc.conf(5).
 export VM_RC_LIST="ntpd sshd waagent firstboot_freebsd_update firstboot_pkgs"
 
 # No swap space; waagent will allocate swap space on the resource disk.
 # See ResourceDisk.EnableSwap and ResourceDisk.SwapSizeMB in waagent.conf
 export NOSWAP=YES
 
 # https://learn.microsoft.com/en-us/partner-center/marketplace/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space
 export VM_BOOTPARTSOFFSET=1M
 
 vm_extra_pre_umount() {
 	mount -t devfs devfs ${DESTDIR}/dev
 
 	# The firstboot_pkgs rc.d script will download the repository
 	# catalogue and install or update pkg when the instance first
 	# launches, so these files would just be replaced anyway; removing
 	# them from the image allows it to boot faster.
 	chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 		/usr/sbin/pkg delete -f -y pkg
 	rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
 
 	chroot ${DESTDIR} ${EMULATOR} pw usermod root -h -
 
 	umount ${DESTDIR}/dev
 
 	cat << EOF >> ${DESTDIR}/etc/rc.conf
 ifconfig_hn0="SYNCDHCP"
 ntpd_sync_on_start="YES"
 EOF
 
 	cat << EOF >> ${DESTDIR}/boot/loader.conf
 autoboot_delay="-1"
 beastie_disable="YES"
 loader_logo="none"
 hw.memtest.tests="0"
 console="comconsole efi vidconsole"
 comconsole_speed="115200"
 boot_multicons="YES"
 boot_serial="YES"
 mlx4en_load="YES"
 mlx5en_load="YES"
 EOF
 
 	touch ${DESTDIR}/firstboot
 
-	rm -f ${DESTDIR}/etc/resolv.conf
-
 	return 0
 }
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index a233bf5981c1..ce09ab0d2367 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -1,111 +1,106 @@
 #!/bin/sh
 
 # Packages which should be installed onto all EC2 AMIs:
 # * ebsnvme-id, which is very minimal and provides important EBS-specific
 # functionality,
 # * amazon-ssm-agent (not enabled by default, but some users need to use
 # it on systems not connected to the internet).
 export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ebsnvme-id amazon-ssm-agent"
 
 # Services which should be enabled by default in rc.conf(5).
 export VM_RC_LIST="dev_aws_disk ntpd"
 
 # Build with a 4.9 GB partition; the growfs rc.d script will expand
 # the partition to fill the root disk after the EC2 instance is launched.
 # Note that if this is set to <N>G, we will end up with an <N+1> GB disk
 # image since VMSIZE is the size of the filesystem partition, not the disk
 # which it resides within.
 export VMSIZE=5000m
 
 # No swap space; it doesn't make sense to provision any as part of the disk
 # image when we could be launching onto a system with anywhere between 0.5
 # and 4096 GB of RAM.
 export NOSWAP=YES
 
 ec2_common() {
 	# Delete the pkg package and the repo database; they will likely be
 	# long out of date before the EC2 instance is launched.
 	mount -t devfs devfs ${DESTDIR}/dev
 	chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 		/usr/sbin/pkg delete -f -y pkg
 	umount ${DESTDIR}/dev
 	rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
 
 	# Turn off IPv6 Duplicate Address Detection; the EC2 networking
 	# configuration makes it unnecessary.
 	echo 'net.inet6.ip6.dad_count=0' >> ${DESTDIR}/etc/sysctl.conf
 
 	# Booting quickly is more important than giving users a chance to
 	# access the boot loader via the serial port.
 	echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf
 	echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf
 
 	# Tell gptboot not to wait 3 seconds for a keypress which will
 	# never arrive.
 	printf -- "-n\n" > ${DESTDIR}/boot.config
 
 	# The emulated keyboard attached to EC2 instances is inaccessible to
 	# users, and there is no mouse attached at all; disable to keyboard
 	# and the keyboard controller (to which the mouse would attach, if
 	# one existed) in order to save time in device probing.
 	echo 'hint.atkbd.0.disabled=1' >> ${DESTDIR}/boot/loader.conf
 	echo 'hint.atkbdc.0.disabled=1' >> ${DESTDIR}/boot/loader.conf
 
 	# EC2 has two consoles: An emulated serial port ("system log"),
 	# which has been present since 2006; and a VGA console ("instance
 	# screenshot") which was introduced in 2016.
 	echo 'boot_multicons="YES"' >> ${DESTDIR}/boot/loader.conf
 
 	# Some older EC2 hardware used a version of Xen with a bug in its
 	# emulated serial port.  It is not clear if EC2 still has any such
 	# nodes, but apply the workaround just in case.
 	echo 'hw.broken_txfifo="1"' >> ${DESTDIR}/boot/loader.conf
 
 	# Load the kernel module for the Amazon "Elastic Network Adapter"
 	echo 'if_ena_load="YES"' >> ${DESTDIR}/boot/loader.conf
 
 	# Use the "nda" driver for accessing NVMe disks rather than the
 	# historical "nvd" driver.
 	echo 'hw.nvme.use_nvd="0"' >> ${DESTDIR}/boot/loader.conf
 
 	# Disable KbdInteractiveAuthentication according to EC2 requirements.
 	sed -i '' -e \
 		's/^#KbdInteractiveAuthentication yes/KbdInteractiveAuthentication no/' \
 		${DESTDIR}/etc/ssh/sshd_config
 
 	# Use FreeBSD Update mirrors hosted in AWS
 	sed -i '' -e 's/update.FreeBSD.org/aws.update.FreeBSD.org/' \
 		${DESTDIR}/etc/freebsd-update.conf
 
 	# Use the NTP service provided by Amazon
 	sed -i '' -e 's/^pool/#pool/' \
 		-e '1,/^#server/s/^#server.*/server 169.254.169.123 iburst/' \
 		${DESTDIR}/etc/ntp.conf
 
 	# Provide a map for accessing Elastic File System mounts
 	cat > ${DESTDIR}/etc/autofs/special_efs <<'EOF'
 #!/bin/sh
 
 if [ $# -eq 0 ]; then
         # No way to know which EFS filesystems exist and are
         # accessible to this EC2 instance.
         exit 0
 fi
 
 # Provide instructions on how to mount the requested filesystem.
 FS=$1
 REGION=`fetch -qo- http://169.254.169.254/latest/meta-data/placement/availability-zone | sed -e 's/[a-z]$//'`
 echo "-nfsv4,minorversion=1,oneopenown ${FS}.efs.${REGION}.amazonaws.com:/"
 EOF
 	chmod 755 ${DESTDIR}/etc/autofs/special_efs
 
 	# The first time the AMI boots, run "first boot" scripts.
 	touch ${DESTDIR}/firstboot
 
-	if ! [ -z "${QEMUSTATIC}" ]; then
-		rm -f ${DESTDIR}/${EMULATOR}
-	fi
-	rm -f ${DESTDIR}/etc/resolv.conf
-
 	return 0
 }
diff --git a/release/tools/gce.conf b/release/tools/gce.conf
index aad4a74d2e39..5ad83bcded53 100644
--- a/release/tools/gce.conf
+++ b/release/tools/gce.conf
@@ -1,124 +1,132 @@
 #!/bin/sh
 #
 #
 
 # The default of 3GB is too small for GCE, so override the size here.
 export VMSIZE=20g
 
 # Set to a list of packages to install.
 export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \
 	firstboot-pkgs google-cloud-sdk panicmail sudo \
 	sysutils/py-google-compute-engine lang/python \
 	lang/python3"
 
 # Set to a list of third-party software to enable in rc.conf(5).
 export VM_RC_LIST="ntpd sshd growfs \
 	firstboot_pkgs firstboot_freebsd_update google_startup \
 	google_accounts_daemon google_clock_skew_daemon \
 	google_instance_setup google_network_daemon"
 
 vm_extra_install_base() {
 	echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf
 	echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf
 	echo 'nameserver 8.8.8.8' >> ${DESTDIR}/etc/resolv.conf
 }
 
 vm_extra_pre_umount() {
 	# Enable growfs on every boot, not only the first, as as instance's disk can
 	# be enlarged post-creation
 	sed -i -e '/KEYWORD: firstboot/d' /etc/rc.d/growfs
 
 	cat << EOF >> ${DESTDIR}/etc/rc.conf
 dumpdev="AUTO"
 ifconfig_DEFAULT="SYNCDHCP mtu 1460"
 ntpd_sync_on_start="YES"
 # need to fill in something here
 #firstboot_pkgs_list=""
 panicmail_autosubmit="YES"
 EOF
 
 	cat << EOF >> ${DESTDIR}/boot/loader.conf
 autoboot_delay="-1"
 beastie_disable="YES"
 loader_logo="none"
 hw.memtest.tests="0"
 console="comconsole,vidconsole"
 hw.vtnet.mq_disable=1
 kern.timecounter.hardware=ACPI-safe
 aesni_load="YES"
 nvme_load="YES"
 EOF
 
 	echo '169.254.169.254 metadata.google.internal metadata' >> \
 		${DESTDIR}/etc/hosts
 
         # overwrite ntp.conf
 	cat << EOF > ${DESTDIR}/etc/ntp.conf
 server metadata.google.internal iburst
 
 restrict default kod nomodify notrap nopeer noquery
 restrict -6 default kod nomodify notrap nopeer noquery
 
 restrict 127.0.0.1
 restrict -6 ::1
 restrict 127.127.1.0
 EOF
 
 	cat << EOF >> ${DESTDIR}/etc/syslog.conf
 *.err;kern.warning;auth.notice;mail.crit                /dev/console
 EOF
 
 	cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config
 KbdInteractiveAuthentication no
 X11Forwarding no
 AcceptEnv LANG
 AllowAgentForwarding no
 ClientAliveInterval 420
 EOF
 
 	cat << EOF >> ${DESTDIR}/etc/crontab
 0       3       *       *       *       root    /usr/sbin/freebsd-update cron
 EOF
 
 	cat << EOF >> ${DESTDIR}/etc/sysctl.conf
 net.inet.icmp.drop_redirect=1
 net.inet.ip.redirect=0
 kern.ipc.soacceptqueue=1024
 debug.trace_on_panic=1
 debug.debugger_on_panic=0
 EOF
 
 	# To meet GCE marketplace requirements, extract the src.txz and
 	# ports.txz distributions to the target virtual machine disk image
 	# and fetch the sources for the third-party software installed on
 	# the image.
 	if [ ! -c "${DESTDIR}/dev/null" ]; then
 		mkdir -p ${DESTDIR}/dev
 		mount -t devfs devfs ${DESTDIR}/dev
 	fi
 	if [ -e "${DESTDIR}/../ftp/src.txz" ]; then
 		tar fxJ ${DESTDIR}/../ftp/src.txz -C ${DESTDIR}
 	fi
 	if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then
 		tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR}
 		_INSTALLED_PACKAGES=$(chroot ${DESTDIR} pkg info -o -q -a)
 		for PACKAGE in ${_INSTALLED_PACKAGES}; do
 			chroot ${DESTDIR} \
 				make -C /usr/ports/${PACKAGE} fetch
 		done
 	fi
 	if [ -c "${DESTDIR}/dev/null" ]; then
 		umount_loop ${DESTDIR}/dev
 	fi
 
 	## XXX: Verify this is needed.  I do not see this requirement
 	## in the docs, and it impairs the ability to boot-test a copy
 	## of the image prior to packaging for upload to GCE.
 	#sed -E -i '' 's/^([^#].*[[:space:]])on/\1off/' ${DESTDIR}/etc/ttys
 
 	touch ${DESTDIR}/firstboot
 
-	rm -f ${DESTDIR}/etc/resolv.conf
+	return 0
+}
 
+# Do everything except deleting resolv.conf since we construct our own
+# Googlized resolv.conf file in vm_extra_install_base.
+vm_emulation_cleanup() {
+	if ! [ -z "${QEMUSTATIC}" ]; then
+		rm -f ${DESTDIR}/${EMULATOR}
+	fi
+	umount_loop ${DESTDIR}/dev
 	return 0
 }
diff --git a/release/tools/oci.conf b/release/tools/oci.conf
index c57a7683a500..a4fe54ad3031 100644
--- a/release/tools/oci.conf
+++ b/release/tools/oci.conf
@@ -1,99 +1,94 @@
 #!/bin/sh
 # Set to a list of packages to install.
 export VM_EXTRA_PACKAGES="
     comms/py-pyserial
     converters/base64
     devel/oci-cli
     devel/py-babel
     devel/py-iso8601
     devel/py-pbr
     devel/py-six
     ftp/curl
     lang/python
     lang/python3
     net/cloud-init
     net/py-eventlet
     net/py-netaddr
     net/py-netifaces
     net/py-oauth
     net/rsync
     panicmail
     security/ca_root_nss
     security/sudo
     sysutils/firstboot-freebsd-update
     sysutils/firstboot-pkgs
     sysutils/panicmail
     textproc/jq
     "
 
 # Should be enough for base image, image can be resized in needed
 export VMSIZE=6g
 
 # Set to a list of third-party software to enable in rc.conf(5).
 export VM_RC_LIST="
     cloudinit
     firstboot_pkgs
     firstboot_freebsd_update
     growfs
     ntpd
     ntpd_sync_on_start
     sshd
     zfs"
 
 vm_extra_pre_umount() {
 	cat <<-'EOF' >> ${DESTDIR}/etc/rc.conf
 		dumpdev=AUTO
 		sendmail_enable=NONE
 EOF
 
 	cat <<-'EOF' >> ${DESTDIR}/boot/loader.conf
 		autoboot_delay="5"
 		beastie_disable="YES"
 		boot_serial="YES"
 		loader_logo="none"
 		cryptodev_load="YES"
 		opensolaris_load="YES"
 		xz_load="YES"
 		zfs_load="YES"
 EOF
 
 	cat <<-'EOF' >> ${DESTDIR}/etc/ssh/sshd_config
 		# S11 Configure the SSH service to prevent password-based login
 		PermitRootLogin prohibit-password
 		PasswordAuthentication no
 		KbdInteractiveAuthentication no
 		PermitEmptyPasswords no
 		UseDNS no
 EOF
 
 	 # S14 Root user login must be disabled on serial-over-ssh console
 	 pw -R ${DESTDIR} usermod root -w no
 	 # OCI requirements override the default FreeBSD cloud-init settings
 	 cat <<-'EOF' >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oci.cfg
 		disable_root: true
 		system_info:
 		   distro: freebsd
 		   default_user:
 		     name: freebsd
 		     lock_passwd: True
 		     gecos: "OCI Default User"
 		     groups: [wheel]
 		     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
 		     shell: /bin/sh
 		   network:
 		      renderers: ['freebsd']
 EOF
 
 	# Use Oracle Cloud Infrastructure NTP server
 	sed -i '' -E -e 's/^pool.*iburst/server 169.254.169.254 iburst/' \
         ${DESTDIR}/etc/ntp.conf
 
 	touch ${DESTDIR}/firstboot
 
-	if ! [ -z "${QEMUSTATIC}" ]; then
-		rm -f ${DESTDIR}/${EMULATOR}
-	fi
-	rm -f ${DESTDIR}/etc/resolv.conf
-
 	return 0
 }
diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf
index 4c905fbae4ba..05d2d13bbb39 100644
--- a/release/tools/openstack.conf
+++ b/release/tools/openstack.conf
@@ -1,54 +1,52 @@
 #!/bin/sh
 #
 #
 
 # Set to a list of packages to install.
 export VM_EXTRA_PACKAGES="net/cloud-init devel/py-pbr devel/py-iso8601 \
 	net/py-eventlet net/py-netaddr comms/py-serial devel/py-six \
 	devel/py-babel net/py-oauth net/py-netifaces"
 
 # Set to a list of third-party software to enable in rc.conf(5).
 export VM_RC_LIST="cloudinit"
 
 export NOSWAP=YES
 
 vm_extra_pre_umount() {
 	#Enable sshd by default
 	echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 
 	# Disable DNS lookups by default to make SSH connect quickly
 	echo 'UseDNS no' >> ${DESTDIR}/etc/ssh/sshd_config
 
 	# Allow root to ssh using keys
 	echo 'PermitRootLogin without-password' >> ${DESTDIR}/etc/ssh/sshd_config
 
 	# Disable sendmail
 	echo 'sendmail_enable="NO"' >> ${DESTDIR}/etc/rc.conf
 	echo 'sendmail_submit_enable="NO"' >> ${DESTDIR}/etc/rc.conf
 	echo 'sendmail_outbound_enable="NO"' >> ${DESTDIR}/etc/rc.conf
 	echo 'sendmail_msp_queue_enable="NO"' >> ${DESTDIR}/etc/rc.conf
 
 	# Enable DHCP for the OpenStack instance
 	echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
 
 	# Openstack wants sudo(8) usable by default without a password.
 	echo 'ALL ALL=(ALL) NOPASSWD:ALL' >> \
 		${DESTDIR}/usr/local/etc/sudoers.d/cloud-init
 
-	rm -f ${DESTDIR}/etc/resolv.conf
-
 	# The console is not interactive, so we might as well boot quickly.
 	echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf
 	echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf
 	echo 'boot_multicons="YES"' >> ${DESTDIR}/boot/loader.conf
 	echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf
 	echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf
 
 	# Reboot quickly, Don't wait at the panic screen
 	echo 'debug.trace_on_panic=1' >> ${DESTDIR}/etc/sysctl.conf
 	echo 'debug.debugger_on_panic=0' >> ${DESTDIR}/etc/sysctl.conf
 	echo 'kern.panic_reboot_wait_time=0' >> ${DESTDIR}/etc/sysctl.conf
 
 	touch ${DESTDIR}/firstboot
 	return 0
 }
diff --git a/release/tools/vagrant-virtualbox.conf b/release/tools/vagrant-virtualbox.conf
index 4dd7ca8953ad..9e0e430bbc88 100644
--- a/release/tools/vagrant-virtualbox.conf
+++ b/release/tools/vagrant-virtualbox.conf
@@ -1,18 +1,17 @@
 #!/bin/sh
 #
 #
 
 . ${WORLDDIR}/release/tools/vagrant.conf
 
 export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} virtualbox-ose-additions-nox11"
 
 vm_extra_pre_umount () {
 	# VirtualBox first boot pkgs
 	echo 'firstboot_pkgs_list="sudo rsync virtualbox-ose-additions-nox11"' >> ${DESTDIR}/etc/rc.conf
 	echo 'vboxguest_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 	echo 'vboxservice_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 
 	# Setup the Vagrant common items
 	vagrant_common
-	rm -f ${DESTDIR}/etc/resolv.conf
 }
diff --git a/release/tools/vagrant-vmware.conf b/release/tools/vagrant-vmware.conf
index 52ff7f1aac1a..fff929829222 100644
--- a/release/tools/vagrant-vmware.conf
+++ b/release/tools/vagrant-vmware.conf
@@ -1,22 +1,21 @@
 #!/bin/sh
 #
 #
 
 . ${WORLDDIR}/release/tools/vagrant.conf
 
 export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} open-vm-tools-nox11"
 
 vm_extra_pre_umount () {
 	# VMWare first boot pkgs
 	echo 'firstboot_pkgs_list="sudo rsync open-vm-tools-nox11"' >> ${DESTDIR}/etc/rc.conf
 
 	echo 'vmware_guest_vmblock_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 	echo 'vmware_guest_vmhgfs_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 	echo 'vmware_guest_vmmemctl_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 	echo 'vmware_guest_vmxnet_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 	echo 'vmware_guestd_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 
 	# Setup the Vagrant common items
 	vagrant_common
-	rm -f ${DESTDIR}/etc/resolv.conf
 }
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index eda22e061c6d..72540dad14a8 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -1,339 +1,338 @@
 #!/bin/sh
 #
 #
 #
 # Common functions for virtual machine image build scripts.
 #
 
 scriptdir=$(dirname $(realpath $0))
 . ${scriptdir}/../../tools/boot/install-boot.sh
 
 export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
 trap "cleanup" INT QUIT TRAP ABRT TERM
 
 # Platform-specific large-scale setup
 # Most platforms use GPT, so put that as default, then special cases
 PARTSCHEME=gpt
 ROOTLABEL="gpt"
 case "${TARGET}:${TARGET_ARCH}" in
 	powerpc:powerpc*)
 		PARTSCHEME=mbr
 		ROOTLABEL="ufs"
 		NOSWAP=yes # Can't label swap partition with MBR, so no swap
 	;;
 esac
 
 err() {
 	printf "${@}\n"
 	cleanup
 	return 1
 }
 
 cleanup() {
 	if [ -c "${DESTDIR}/dev/null" ]; then
 		umount_loop ${DESTDIR}/dev 2>/dev/null
 	fi
 
 	return 0
 }
 
 vm_create_base() {
 
 	mkdir -p ${DESTDIR}
 
 	return 0
 }
 
 vm_copy_base() {
 	# Defunct
 }
 
 vm_install_base() {
 	# Installs the FreeBSD userland/kernel to the virtual machine disk.
 
 	cd ${WORLDDIR} && \
 		make DESTDIR=${DESTDIR} \
 		installworld installkernel distribution || \
 		err "\n\nCannot install the base system to ${DESTDIR}."
 
 	# Bootstrap etcupdate(8) and mergemaster(8) databases.
 	mkdir -p ${DESTDIR}/var/db/etcupdate
 	etcupdate extract -B \
 		-M "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \
 		-s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate
 	sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \
 		-F "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \
 		-D ${DESTDIR}
 
 	echo '# Custom /etc/fstab for FreeBSD VM images' \
 		> ${DESTDIR}/etc/fstab
 	if [ "${VMFS}" != zfs ]; then
 		echo "/dev/${ROOTLABEL}/rootfs   /       ${VMFS}   rw      1       1" \
 			>> ${DESTDIR}/etc/fstab
 	fi
 	if [ -z "${NOSWAP}" ]; then
 		echo '/dev/gpt/swapfs  none    swap    sw      0       0' \
 			>> ${DESTDIR}/etc/fstab
 	fi
 
 	local hostname
 	hostname="$(echo $(uname -o) | tr '[:upper:]' '[:lower:]')"
 	echo "hostname=\"${hostname}\"" >> ${DESTDIR}/etc/rc.conf
 	if [ "${VMFS}" = zfs ]; then
 		echo "zfs_enable=\"YES\"" >> ${DESTDIR}/etc/rc.conf
 		echo "zpool_reguid=\"zroot\"" >> ${DESTDIR}/etc/rc.conf
 		echo "zpool_upgrade=\"zroot\"" >> ${DESTDIR}/etc/rc.conf
+		echo "kern.geom.label.disk_ident.enable=0" >> ${DESTDIR}/boot/loader.conf
+		echo "zfs_load=YES" >> ${DESTDIR}/boot/loader.conf
 	fi
 
+	return 0
+}
+
+vm_emulation_setup() {
 	if ! [ -z "${QEMUSTATIC}" ]; then
 		export EMULATOR=/qemu
 		cp ${QEMUSTATIC} ${DESTDIR}/${EMULATOR}
 	fi
 
 	mkdir -p ${DESTDIR}/dev
 	mount -t devfs devfs ${DESTDIR}/dev
 	chroot ${DESTDIR} ${EMULATOR} /usr/bin/newaliases
 	chroot ${DESTDIR} ${EMULATOR} /bin/sh /etc/rc.d/ldconfig forcestart
-	umount_loop ${DESTDIR}/dev
-
 	cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf
 
-        if [ "${VMFS}" = zfs ]; then
-		echo "kern.geom.label.disk_ident.enable=0" >> ${DESTDIR}/boot/loader.conf
-		echo "zfs_load=YES" >> ${DESTDIR}/boot/loader.conf
-        fi
-
 	return 0
 }
 
 vm_extra_install_base() {
 	# Prototype.  When overridden, runs extra post-installworld commands
 	# as needed, based on the target virtual machine image or cloud
 	# provider image target.
 
 	return 0
 }
 
 vm_extra_enable_services() {
 	if [ ! -z "${VM_RC_LIST}" ]; then
 		for _rcvar in ${VM_RC_LIST}; do
 			echo ${_rcvar}_enable="YES" >> ${DESTDIR}/etc/rc.conf
 		done
 	fi
 
 	if [ -z "${VMCONFIG}" -o -c "${VMCONFIG}" ]; then
 		echo 'ifconfig_DEFAULT="DHCP inet6 accept_rtadv"' >> \
 			${DESTDIR}/etc/rc.conf
 		# Expand the filesystem to fill the disk.
 		echo 'growfs_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 		touch ${DESTDIR}/firstboot
 	fi
 
 	return 0
 }
 
 vm_extra_install_packages() {
 	if [ -z "${VM_EXTRA_PACKAGES}" ]; then
 		return 0
 	fi
-	mkdir -p ${DESTDIR}/dev
-	mount -t devfs devfs ${DESTDIR}/dev
 	chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 		/usr/sbin/pkg bootstrap -y
 	for p in ${VM_EXTRA_PACKAGES}; do
 		chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 			/usr/sbin/pkg install -y ${p}
 	done
-	umount_loop ${DESTDIR}/dev
 
 	return 0
 }
 
 vm_extra_install_ports() {
 	# Prototype.  When overridden, installs additional ports within the
 	# virtual machine environment.
 
 	return 0
 }
 
 vm_extra_pre_umount() {
 	# Prototype.  When overridden, performs additional tasks within the
 	# virtual machine environment prior to unmounting the filesystem.
-	# Note: When overriding this function, removing resolv.conf in the
-	# disk image must be included.
 
+	return 0
+}
+
+vm_emulation_cleanup() {
 	if ! [ -z "${QEMUSTATIC}" ]; then
 		rm -f ${DESTDIR}/${EMULATOR}
 	fi
 	rm -f ${DESTDIR}/etc/resolv.conf
+	umount_loop ${DESTDIR}/dev
 	return 0
 }
 
 vm_extra_pkg_rmcache() {
 	if [ -e ${DESTDIR}/usr/local/sbin/pkg ]; then
 		chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 			/usr/local/sbin/pkg clean -y -a
 	fi
 
 	return 0
 }
 
 buildfs() {
 	local md tmppool
 
 	case "${VMFS}" in
 	ufs)
 		makefs ${MAKEFSARGS} -o label=rootfs -o version=2 -o softupdates=1 \
 			${VMBASE} ${DESTDIR}
 		;;
 	zfs)
 		makefs -t zfs ${MAKEFSARGS} \
 			-o poolname=zroot -o bootfs=zroot/ROOT/default -o rootpath=/ \
 			-o fs=zroot\;mountpoint=none \
 			-o fs=zroot/ROOT\;mountpoint=none \
 			-o fs=zroot/ROOT/default\;mountpoint=/ \
 			-o fs=zroot/home\;mountpoint=/home \
 			-o fs=zroot/tmp\;mountpoint=/tmp\;exec=on\;setuid=off \
 			-o fs=zroot/usr\;mountpoint=/usr\;canmount=off \
 			-o fs=zroot/usr/ports\;setuid=off \
 			-o fs=zroot/usr/src \
 			-o fs=zroot/usr/obj \
 			-o fs=zroot/var\;mountpoint=/var\;canmount=off \
 			-o fs=zroot/var/audit\;setuid=off\;exec=off \
 			-o fs=zroot/var/crash\;setuid=off\;exec=off \
 			-o fs=zroot/var/log\;setuid=off\;exec=off \
 			-o fs=zroot/var/mail\;atime=on \
 			-o fs=zroot/var/tmp\;setuid=off \
 			${VMBASE} ${DESTDIR}
 		;;
 	*)
 		echo "Unexpected VMFS value '${VMFS}'"
 		exit 1
 		;;
 	esac
 }
 
 umount_loop() {
 	DIR=$1
 	i=0
 	sync
 	while ! umount ${DIR}; do
 		i=$(( $i + 1 ))
 		if [ $i -ge 10 ]; then
 			# This should never happen.  But, it has happened.
 			echo "Cannot umount(8) ${DIR}"
 			echo "Something has gone horribly wrong."
 			return 1
 		fi
 		sleep 1
 	done
 
 	return 0
 }
 
 vm_create_disk() {
 	local BOOTFILES BOOTPARTSOFFSET FSPARTTYPE X86GPTBOOTFILE
 
 	if [ -z "${NOSWAP}" ]; then
 		SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}"
 	fi
 
 	if [ -n "${VM_BOOTPARTSOFFSET}" ]; then
 		BOOTPARTSOFFSET=":${VM_BOOTPARTSOFFSET}"
 	fi
 
 	if [ -n "${CONFIG_DRIVE}" ]; then
 		CONFIG_DRIVE="-p freebsd/config-drive::${CONFIG_DRIVE_SIZE}"
 	fi
 
 	case "${VMFS}" in
 	ufs)
 		FSPARTTYPE=freebsd-ufs
 		X86GPTBOOTFILE=i386/gptboot/gptboot
 		;;
 	zfs)
 		FSPARTTYPE=freebsd-zfs
 		X86GPTBOOTFILE=i386/gptzfsboot/gptzfsboot
 		;;
 	*)
 		echo "Unexpected VMFS value '${VMFS}'"
 		return 1
 		;;
 	esac
 
 	echo "Creating image...  Please wait."
 	echo
 
 	BOOTFILES="$(env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		WITH_UNIFIED_OBJDIR=yes \
 		make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 	MAKEFSARGS="-s ${VMSIZE}"
 
 	case "${TARGET}:${TARGET_ARCH}" in
 		amd64:amd64 | i386:i386)
 			ESP=yes
 			BOOTPARTS="-b ${BOOTFILES}/i386/pmbr/pmbr \
 				   -p freebsd-boot/bootfs:=${BOOTFILES}/${X86GPTBOOTFILE}${BOOTPARTSOFFSET}"
 			ROOTFSPART="-p ${FSPARTTYPE}/rootfs:=${VMBASE}"
 			MAKEFSARGS="$MAKEFSARGS -B little"
 			;;
 		arm64:aarch64 | riscv:riscv64*)
 			ESP=yes
 			BOOTPARTS=
 			ROOTFSPART="-p ${FSPARTTYPE}/rootfs:=${VMBASE}"
 			MAKEFSARGS="$MAKEFSARGS -B little"
 			;;
 		powerpc:powerpc*)
 			ESP=no
 			BOOTPARTS="-p prepboot:=${BOOTFILES}/powerpc/boot1.chrp/boot1.elf -a 1"
 			ROOTFSPART="-p freebsd:=${VMBASE}"
 			if [ ${TARGET_ARCH} = powerpc64le ]; then
 				MAKEFSARGS="$MAKEFSARGS -B little"
 			else
 				MAKEFSARGS="$MAKEFSARGS -B big"
 			fi
 			;;
 		*)
 			echo "vmimage.subr: unsupported target '${TARGET}:${TARGET_ARCH}'" >&2
 			exit 1
 			;;
 	esac
 
 	if [ ${ESP} = "yes" ]; then
 		# Create an ESP
 		espfilename=$(mktemp /tmp/efiboot.XXXXXX)
 		make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi
 		BOOTPARTS="${BOOTPARTS} -p efi/efiesp:=${espfilename}"
 
 		# Add this to fstab
 		mkdir -p ${DESTDIR}/boot/efi
 		echo "/dev/${ROOTLABEL}/efiesp	/boot/efi       msdosfs     rw      2       2" \
 			>> ${DESTDIR}/etc/fstab
 	fi
 
 	echo "Building filesystem...  Please wait."
 	buildfs
 
 	echo "Building final disk image...  Please wait."
 	mkimg -s ${PARTSCHEME} -f ${VMFORMAT} \
 		${BOOTPARTS} \
 		${SWAPOPT} \
 		${CONFIG_DRIVE} \
 		${ROOTFSPART} \
 		-o ${VMIMAGE}
 
 	echo "Disk image ${VMIMAGE} created."
 
 	if [ ${ESP} = "yes" ]; then
 		rm ${espfilename}
 	fi
 
 	return 0
 }
 
 vm_extra_create_disk() {
 
 	return 0
 }