From ca5e0dd79331ad9dd4339f96738a6e8eba237d4e Mon Sep 17 00:00:00 2001 From: krw Date: Sun, 11 Sep 2022 15:05:27 +0000 Subject: [PATCH] Replace "echo 'w\ny\nq\n' | disklabel -E" with equivalent 'disklabel -dw'. Tested & ok visa@ --- distrib/octeon/ramdisk/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile index dd34c7165b1..25712eabba6 100644 --- a/distrib/octeon/ramdisk/Makefile +++ b/distrib/octeon/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2022/02/06 15:52:23 krw Exp $ +# $OpenBSD: Makefile,v 1.22 2022/09/11 15:05:27 krw Exp $ FS= miniroot${OSrev}.img FSSIZE= 24576 @@ -24,7 +24,7 @@ ${FS}: bsd.rd dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd fdisk -iy -b "${MSDOSSIZE}@${MSDOSSTART}:c" `cat vnd` >/dev/null - echo 'w\ny\nq\n' | disklabel -E `cat vnd` > /dev/null + disklabel -wd `cat vnd` > /dev/null newfs -t msdos /dev/r`cat vnd`i mount ${MOUNT_ARGS_msdos} /dev/`cat vnd`i ${MOUNT_POINT} cp bsd.rd ${MOUNT_POINT}/bsd.rd -- 2.20.1