From: kn <kn@openbsd.org>
Date: Wed, 24 Aug 2022 14:57:52 +0000 (+0000)
Subject: Add missing root-explicit-stages test, omit -v by default
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=56167ffb7f14b2a3b2c5b5421baf1a9d55885bde;p=openbsd

Add missing root-explicit-stages test, omit -v by default
---

diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index fba0646f926..f0277df772f 100644
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.1 2022/08/21 17:03:18 kn Exp $
+#	$OpenBSD: Makefile,v 1.2 2022/08/24 14:57:52 kn Exp $
 
-INSTALLBOOT ?=		/usr/sbin/installboot -v
+INSTALLBOOT ?=		/usr/sbin/installboot
 DRY_RUN =		${INSTALLBOOT} -n
 REAL_RUN =		${INSTALLBOOT}
 
@@ -80,6 +80,15 @@ dry-root:
 root-installer:
 	${SUDO} installboot -r /mnt "$$(<${SRFILE})"
 
+root-explicit-stages:
+.if   ${MACHINE} == "amd64"	# assume BIOS/MBR
+	${SUDO} installboot -- "$$(<${SRFILE})" ${NEWROOT}/usr/mdec/biosboot ${NEWROOT}/usr/mdec/boot
+.elif ${MACHINE} == "arm64"
+	${SUDO} installboot -- "$$(<${SRFILE})" ${NEWROOT}/usr/mdec/BOOTAA64.EFI
+.elif ${MACHINE} == "sparc64"
+	${SUDO} installboot -- "$$(<${SRFILE})" ${NEWROOT}/usr/mdec/bootblk ${NEWROOT}/usr/mdec/ofwboot
+.endif
+
 
 REGRESS_EXPECTED_FAILURES =	dry-prepare-root \
 				dry-prepare-stage \