diff options
| author | Klemens Nanni <kn@cvs.openbsd.org> | 2022-08-29 18:42:29 +0000 |
|---|---|---|
| committer | Klemens Nanni <kn@cvs.openbsd.org> | 2022-08-29 18:42:29 +0000 |
| commit | 90054c82a53a6612fd8d4050c372953a6df03845 (patch) | |
| tree | 69f0158fbc88a85a14f21f2bccf6b1c4febb36f1 /regress | |
| parent | 471560af033e8cffaff41c53b80c60bd6adfc87e (diff) | |
Hook up installboot(8) tests on i386
Passes like amd64 as both use MBR/biosboot(8) at the moment.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.sbin/Makefile | 4 | ||||
| -rw-r--r-- | regress/usr.sbin/installboot/Makefile | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/regress/usr.sbin/Makefile b/regress/usr.sbin/Makefile index d596d796e62..d51bf16a02e 100644 --- a/regress/usr.sbin/Makefile +++ b/regress/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2022/08/24 15:01:32 kn Exp $ +# $OpenBSD: Makefile,v 1.29 2022/08/29 18:42:28 kn Exp $ SUBDIR += acme-client SUBDIR += arp @@ -20,7 +20,7 @@ SUBDIR += syslogd SUBDIR += vmd .endif -.if ${MACHINE} == "amd64" +.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" SUBDIR += installboot .endif diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile index f14a4c519d6..06aae11e8db 100644 --- a/regress/usr.sbin/installboot/Makefile +++ b/regress/usr.sbin/installboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2022/08/26 11:06:47 kn Exp $ +# $OpenBSD: Makefile,v 1.8 2022/08/29 18:42:28 kn Exp $ INSTALLBOOT ?= /usr/sbin/installboot DRY_RUN = ${INSTALLBOOT} -n @@ -11,7 +11,8 @@ DEVFILES = ${NCHUNKS:=vnd%.txt} SRFILE = sr.txt MOUNTPOINT = mnt STAGEDIR = /usr/mdec -.if ${MACHINE} == "amd64" # assume BIOS/MBR +.if ${MACHINE} == "amd64" || \ + ${MACHINE} == "i386" # assume BIOS/MBR STAGENAMES = biosboot boot .elif ${MACHINE} == "arm64" STAGENAMES = BOOTAA64.EFI @@ -31,7 +32,8 @@ create-new-chunks: # what the installer does, see /usr/src/distrib/$(machine)/ramdisk/install.md format-new-chunks: create-new-chunks .for devfile in ${DEVFILES} -.if ${MACHINE} == "amd64" # assume BIOS/MBR +.if ${MACHINE} == "amd64" || \ + ${MACHINE} == "i386" # assume BIOS/MBR ${SUDO} fdisk -iy -- "$$(<${devfile})" 1>/dev/null .elif ${MACHINE} == "arm64" ${SUDO} fdisk -g -y -b32768 -- "$$(<${devfile})" 1>/dev/null |