diff options
| author | Klemens Nanni <kn@cvs.openbsd.org> | 2022-08-31 22:54:42 +0000 |
|---|---|---|
| committer | Klemens Nanni <kn@cvs.openbsd.org> | 2022-08-31 22:54:42 +0000 |
| commit | da4678bb8ea8bd10e667ca9f03cef6996f232185 (patch) | |
| tree | efe9505b278357c5c351626b47af0426a08900fa /regress | |
| parent | 842431963bf9830185994ff757a020882ee84db6 (diff) | |
Always run prepare
Not all architectures require/implement -p, but installboot(8) provides stubs,
so leave it to the program to (not) do something.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.sbin/installboot/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
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 \ |