Use makefs(8) in release VM-image generation instead of md(4) and newfs.

Using makefs instead reduces the privileges needed to build VM images,
simplifies the script (no need to copy files to a fresh image at the end),
and improves portability by allowing generation of cross-endian images.
As a result of the last, this patch also adds support for generation of
powerpc64 and powerpc64le VM images.

No other changes to the output. Tested and working for both amd64 and
powerpc64 targets.

Reviewed by:	gjb
Differential Revision:	https://reviews.freebsd.org/D28912

2 files changed, 77 insertions, 102 deletions

diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh
index cf795e04655b..d5985ceb0d25 100755
--- a/release/scripts/mk-vmimage.sh
+++ b/release/scripts/mk-vmimage.sh
@@ -93,8 +93,6 @@ main() {
 		. "${VMCONFIG}"
 	fi
 
-	ROOTLABEL="gpt"
-
 	vm_create_base
 	vm_install_base
 	vm_extra_install_base
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 7bd971013656..6e0c1ea633e2 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -12,70 +12,17 @@ scriptdir=$(dirname $(realpath $0))
 export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
 trap "cleanup" INT QUIT TRAP ABRT TERM
 
-write_partition_layout() {
-	if [ -z "${NOSWAP}" ]; then
-		SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}"
-	fi
-
-	BOOTFILES="$(env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		WITH_UNIFIED_OBJDIR=yes \
-		make -C ${WORLDDIR}/stand -V .OBJDIR)"
-	BOOTFILES="$(realpath ${BOOTFILES})"
-
-	case "${TARGET}:${TARGET_ARCH}" in
-		amd64:amd64 | i386:i386)
-			ESP=yes
-			SCHEME=gpt
-			BOOTPARTS="-b ${BOOTFILES}/i386/pmbr/pmbr \
-				   -p freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot"
-			ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
-			;;
-		arm64:aarch64 | riscv:riscv64*)
-			ESP=yes
-			SCHEME=gpt
-			BOOTPARTS=
-			ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
-			;;
-		powerpc:powerpc*)
-			ESP=no
-			SCHEME=apm
-			BOOTPARTS="-p apple-boot/bootfs:=${BOOTFILES}/powerpc/boot1.chrp/boot1.hfs"
-			ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
-			;;
-		*)
-			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, requires temporarily remounting the fs
-		mddev=$(mdconfig -f ${VMBASE})
-		mount /dev/${mddev} ${DESTDIR}
-		mkdir -p ${DESTDIR}/boot/efi
-		echo "/dev/${ROOTLABEL}/efiesp	/boot/efi       msdosfs     rw      2       2" \
-			>> ${DESTDIR}/etc/fstab
-		umount ${DESTDIR}
-		mdconfig -d -u ${mddev}
-	fi
-
-	mkimg -s ${SCHEME} -f ${VMFORMAT} \
-		${BOOTPARTS} \
-		${SWAPOPT} \
-		${ROOTFSPART} \
-		-o ${VMIMAGE}
-
-	if [ ${ESP} = "yes" ]; then
-		rm ${espfilename}
-	fi
-
-	return 0
-}
+# 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"
@@ -87,10 +34,6 @@ cleanup() {
 	if [ -c "${DESTDIR}/dev/null" ]; then
 		umount_loop ${DESTDIR}/dev 2>/dev/null
 	fi
-	umount_loop ${DESTDIR}
-	if [ ! -z "${mddev}" ]; then
-		mdconfig -d -u ${mddev}
-	fi
 
 	return 0
 }
@@ -100,42 +43,12 @@ vm_create_base() {
 	# written to the formatted disk image with mkimg(1).
 
 	mkdir -p ${DESTDIR}
-	truncate -s ${VMSIZE} ${VMBASE}
-	mddev=$(mdconfig -f ${VMBASE})
-	newfs -L rootfs /dev/${mddev}
-	mount /dev/${mddev} ${DESTDIR}
 
 	return 0
 }
 
 vm_copy_base() {
-	# Creates a new UFS root filesystem and copies the contents of the
-	# current root filesystem into it.  This produces a "clean" disk
-	# image without any remnants of files which were created temporarily
-	# during image-creation and have since been deleted (e.g., downloaded
-	# package archives).
-
-	mkdir -p ${DESTDIR}/old
-	mdold=$(mdconfig -f ${VMBASE})
-	mount /dev/${mdold} ${DESTDIR}/old
-
-	truncate -s ${VMSIZE} ${VMBASE}.tmp
-	mkdir -p ${DESTDIR}/new
-	mdnew=$(mdconfig -f ${VMBASE}.tmp)
-	newfs -L rootfs /dev/${mdnew}
-	mount /dev/${mdnew} ${DESTDIR}/new
-
-	tar -cf- -C ${DESTDIR}/old . | tar -xUf- -C ${DESTDIR}/new
-
-	umount_loop /dev/${mdold}
-	rmdir ${DESTDIR}/old
-	mdconfig -d -u ${mdold}
-
-	umount_loop /dev/${mdnew}
-	rmdir ${DESTDIR}/new
-	tunefs -n enable /dev/${mdnew}
-	mdconfig -d -u ${mdnew}
-	mv ${VMBASE}.tmp ${VMBASE}
+	# Defunct
 }
 
 vm_install_base() {
@@ -276,7 +189,71 @@ vm_create_disk() {
 	echo "Creating image...  Please wait."
 	echo
 
-	write_partition_layout || return 1
+	if [ -z "${NOSWAP}" ]; then
+		SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}"
+	fi
+
+	BOOTFILES="$(env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		WITH_UNIFIED_OBJDIR=yes \
+		make -C ${WORLDDIR}/stand -V .OBJDIR)"
+	BOOTFILES="$(realpath ${BOOTFILES})"
+
+	case "${TARGET}:${TARGET_ARCH}" in
+		amd64:amd64 | i386:i386)
+			ESP=yes
+			BOOTPARTS="-b ${BOOTFILES}/i386/pmbr/pmbr \
+				   -p freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot"
+			ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
+			MAKEFSARGS="-B little"
+			;;
+		arm64:aarch64 | riscv:riscv64*)
+			ESP=yes
+			BOOTPARTS=
+			ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
+			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="-B little"
+			else
+				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."
+	makefs ${MAKEFSARGS} -o label=rootfs -o version=2 -o softupdates=1 \
+	    -s ${VMSIZE} ${VMBASE} ${DESTDIR}
+
+	echo "Building final disk image...  Please wait."
+	mkimg -s ${PARTSCHEME} -f ${VMFORMAT} \
+		${BOOTPARTS} \
+		${SWAPOPT} \
+		${ROOTFSPART} \
+		-o ${VMIMAGE}
+
+	if [ ${ESP} = "yes" ]; then
+		rm ${espfilename}
+	fi
 
 	return 0
 }