From 87588f1efc66623f556096e5f4ecf5f7e8ae07c5 Mon Sep 17 00:00:00 2001
From: kn <kn@openbsd.org>
Date: Sun, 20 Aug 2023 22:38:49 +0000
Subject: [PATCH] stricter devname match on bioctl(8) output avoids false
 positives on failure

---
 regress/usr.sbin/installboot/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index b4f64c2fcc1..d9b5260116f 100644
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.38 2023/02/07 15:04:27 kn Exp $
+#	$OpenBSD: Makefile,v 1.39 2023/08/20 22:38:49 kn Exp $
 
 INSTALLBOOT ?=		/usr/sbin/installboot
 DRY_RUN =		${INSTALLBOOT} -n
@@ -84,7 +84,7 @@ create-root: create-disks
 .if ${USE_SOFTRAID:L} == "yes"
 	${SUDO} bioctl -l"$$(sed -- s/$$/a/ ${DISKDEVFILES} | paste -sd, -- -)" \
 	    -c1C -k"$$(<${KEYDEVFILE})"a -- softraid0 | \
-		awk -- '{ print $$NF }' 1>${ROOTDEVFILE}
+		grep -o -- 'sd[0-9]*$$' 1>${ROOTDEVFILE}
 	${SUDO} ${FORMAT_DISK} -- "$$(<${ROOTDEVFILE})" 1>/dev/null
 .else
 	ln -s -- ${DISKDEVFILES} ${ROOTDEVFILE}
-- 
2.20.1