From: kn <kn@openbsd.org>
Date: Wed, 31 Aug 2022 22:54:41 +0000 (+0000)
Subject: Always run prepare
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ec41afd56dbdae5408e9fe54728b0c2fd74cf616;p=openbsd

Always run prepare

Not all architectures require/implement -p, but installboot(8) provides stubs,
so leave it to the program to (not) do something.
---

diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index 6c80fa530a9..046f2d73c27 100644
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2022/08/31 20:48:55 kn Exp $
+#	$OpenBSD: Makefile,v 1.11 2022/08/31 22:54:41 kn Exp $
 
 INSTALLBOOT ?=		/usr/sbin/installboot
 DRY_RUN =		${INSTALLBOOT} -n
@@ -60,8 +60,7 @@ copy-bootstrap-to-softraid: format-new-softraid
 	${SUDO} cp -r -- ${STAGEDIR} ${MOUNTPOINT}/usr/
 
 
-# most but not all usages rquire the EFI filesystem to be usable
-.if ${MACHINE} == "arm64"
+# must be first as some targets expect a working filesystem
 REGRESS_TARGETS = prepare
 
 # what the installer does, see /usr/src/distrib/$(machine)/ramdisk/install.md
@@ -72,9 +71,7 @@ prepare:
 .  for devfile in ${DISKDEVFILES}
 	${SUDO} ${REAL_RUN} -p -- "$$(<${devfile})"
 .  endfor
-.else
-REGRESS_TARGETS =	# empty
-.endif
+
 REGRESS_TARGETS +=	dry-prepare \
 			dry-default \
 			dry-root \