Use exact fdisk arguments from "(W)hole disk" answer

Not all architectures did what the installer does with empty disks.

diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index 07cc998..7a74b35 100644 (file)
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.19 2022/09/05 11:12:20 kn Exp $
+#      $OpenBSD: Makefile,v 1.20 2022/09/05 19:32:50 kn Exp $
 
 INSTALLBOOT ?=         /usr/sbin/installboot
 DRY_RUN =              ${INSTALLBOOT} -n
@@ -14,23 +14,23 @@ FORMAT_DISK =               fdisk -iy
 STAGENAMES =           biosboot boot
 USE_SOFTRAID ?=                Yes
 .elif ${MACHINE} == "arm64"
-FORMAT_DISK =          fdisk -g -y -b32768
+FORMAT_DISK =          fdisk -iy -b '32768@32768:C'
 STAGENAMES =           BOOTAA64.EFI
 USE_SOFTRAID ?=                Yes
 .elif ${MACHINE} == "armv7"
-FORMAT_DISK =          fdisk -g -y -b32768@32768:C
+FORMAT_DISK =          fdisk -iy -b '32768@32768:C'
 STAGENAMES =           BOOTARM.EFI
 USE_SOFTRAID ?=                No
 .elif ${MACHINE} == "macppc"   # assume MBR
-FORMAT_DISK =          fdisk -iy -b2048@1:06
+FORMAT_DISK =          fdisk -iy -b '2048@1:06'
 STAGENAMES =           ofwboot
 USE_SOFTRAID ?=                No
 .elif ${MACHINE} == "powerpc64"
-FORMAT_DISK =          fdisk -iy -b32768@32768:C
+FORMAT_DISK =          fdisk -iy -b '32768@32768:C'
 STAGENAMES =           boot
 USE_SOFTRAID ?=                No
 .elif ${MACHINE} == "riscv64"
-FORMAT_DISK =          fdisk -g -y -b32768@32768:C
+FORMAT_DISK =          fdisk -iy -b '32768@32768:C'
 STAGENAMES =           BOOTRISCV64.EFI
 USE_SOFTRAID ?=                No
 .elif ${MACHINE} == "sparc64"