From f804e549ecb56bd1874f9a205fb3830bd480dbca Mon Sep 17 00:00:00 2001 From: kn Date: Sun, 4 Sep 2022 08:24:09 +0000 Subject: [PATCH] Use simpler disklabel template --- regress/usr.sbin/installboot/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile index 93496db1884..01b45710fb4 100644 --- a/regress/usr.sbin/installboot/Makefile +++ b/regress/usr.sbin/installboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2022/09/01 17:23:36 kn Exp $ +# $OpenBSD: Makefile,v 1.18 2022/09/04 08:24:09 kn Exp $ INSTALLBOOT ?= /usr/sbin/installboot DRY_RUN = ${INSTALLBOOT} -n @@ -66,8 +66,8 @@ format-disks: create-disks .for devfile in ${DISKDEVFILES} ${SUDO} ${FORMAT_DISK} -- "$$(<${devfile})" 1>/dev/null . if ${USE_SOFTRAID:L} == "yes" - printf 'a\n\n\n\nRAID\nw\nq\n' | \ - ${SUDO} disklabel -E -- "$$(<${devfile})" 1>/dev/null + echo 'RAID 1M-* 100%' | \ + ${SUDO} disklabel -wAT/dev/stdin -- "$$(<${devfile})" 1>/dev/null . endif .endfor -- 2.20.1