From 2b579ee10137077ed0b704083fa911745e709c90 Mon Sep 17 00:00:00 2001 From: krw Date: Tue, 7 Feb 2023 15:33:22 +0000 Subject: [PATCH] switch to new simplified disklabel template format. ok kn@ --- regress/sys/dev/softraid/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regress/sys/dev/softraid/Makefile b/regress/sys/dev/softraid/Makefile index d1738bd8a84..ace9d8c9dbb 100644 --- a/regress/sys/dev/softraid/Makefile +++ b/regress/sys/dev/softraid/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2021/10/06 22:59:23 bluhm Exp $ +# $OpenBSD: Makefile,v 1.2 2023/02/07 15:33:22 krw Exp $ # # Copyright (c) 2021 Alexander Bluhm # @@ -37,7 +37,7 @@ vnd-$v: unconfig rm -f diskimage$v dd if=/dev/null of=diskimage$v bs=1m seek=1100 vnconfig vnd$v diskimage$v - printf "a\n\n\n\nRAID\nw\nq\n" | disklabel -E vnd$v + printf "RAID *" | disklabel -wAT- vnd$v [ `disklabel vnd$v | grep -c '\'` -eq 1 ] .endfor @@ -68,7 +68,7 @@ raid-1C: vnd-1 vnd-2 vnd-3 passfile .PHONY: mount-$r mount-$r: raid-$r @echo '==== $@ ====' - printf "a\na\n\n\n4.2BSD\nw\nq\n" | disklabel -E "`${LASTDISK}`" + printf "/ *" | disklabel -wAT- "`${LASTDISK}`" newfs "/dev/r`${LASTDISK}`a" mkdir -p /mnt/regress-softraid mount "/dev/`${LASTDISK}`a" /mnt/regress-softraid -- 2.20.1