Enable softraid(4) support in installboot(8)

riscv64 efiboot already supports booting from softraid volumes.

These installboot bits make sure that the boot loader will be installed on
chunk devices rather than the volume for root on softraid installations,
i.e. full boot support for riscv64, just like amd64, arm64 and sparc64.

regress is happy.

OK kettenis

diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index d481719..f976ef6 100644 (file)
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.35 2022/11/08 12:08:53 kn Exp $
+#      $OpenBSD: Makefile,v 1.36 2023/01/16 22:59:41 kn Exp $
 
 INSTALLBOOT ?=         /usr/sbin/installboot
 DRY_RUN =              ${INSTALLBOOT} -n
@@ -27,6 +27,7 @@ STAGENAMES =          boot
 STAGENAMES =           boot
 .elif ${MACHINE} == "riscv64"
 STAGENAMES =           BOOTRISCV64.EFI
+USE_SOFTRAID ?=                Yes
 .elif ${MACHINE} == "sparc64"
 FORMAT_DISK =          true    # NOOP
 STAGENAMES =           bootblk ofwboot

diff --git a/usr.sbin/installboot/Makefile b/usr.sbin/installboot/Makefile
index 6e1d1ef..67aab93 100644 (file)
--- a/usr.sbin/installboot/Makefile
+++ b/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.26 2022/08/31 18:46:06 miod Exp $
+#      $OpenBSD: Makefile,v 1.27 2023/01/16 22:59:41 kn Exp $
 
 PROG=          installboot
 SRCS=          installboot.c util.c
@@ -16,7 +16,7 @@ SRCS += i386_installboot.c
 SRCS += i386_nlist.c
 SRCS += i386_softraid.c
 .elif ${MACHINE} == "armv7" || ${MACHINE} == "arm64" || ${MACHINE} == "riscv64"
-.  if ${MACHINE} == "arm64"
+.  if ${MACHINE} == "arm64" || ${MACHINE} == "riscv64"
 CFLAGS += -DSOFTRAID
 SRCS += efi_softraid.c
 .  endif