From 27592c65088085db86362dc1d070211779aadb85 Mon Sep 17 00:00:00 2001 From: krw Date: Fri, 28 Apr 2023 12:26:43 +0000 Subject: [PATCH] Move FSDISKTYPE uses from disklabel(8) invocations to vnconfig(8) invocations, making the geometry information written to the disklabel a bit more logically related to the disktab information from whence it came. Also makes FSDISKTYPE usage consistent. Flip the disklabel(8) invocations to the "echo '/ *'" idiom to make it obvious that the desire is to create a single 'a' partition containing all free space. No intentional functional change. MBRs, disklabels and newfs outputs appear identical. reads good to kn@ --- distrib/alpha/miniroot/Makefile | 6 +++--- distrib/amd64/ramdiskA/Makefile | 6 +++--- distrib/i386/iso/Makefile | 8 ++++---- distrib/i386/ramdisk/Makefile | 6 +++--- distrib/i386/ramdisk_cd/Makefile | 8 ++++---- distrib/landisk/ramdisk/Makefile | 4 ++-- distrib/luna88k/ramdisk/Makefile | 6 +++--- distrib/sparc64/iso/Makefile | 6 +++--- distrib/sparc64/miniroot/Makefile | 6 +++--- distrib/sparc64/ramdisk/Makefile | 6 +++--- distrib/sparc64/ramdiskB/Makefile | 6 +++--- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile index 58323943cce..ec8dff40f6e 100644 --- a/distrib/alpha/miniroot/Makefile +++ b/distrib/alpha/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2023/04/28 08:45:24 krw Exp $ +# $OpenBSD: Makefile,v 1.26 2023/04/28 12:26:43 krw Exp $ FS= miniroot${OSrev}.img FSSIZE= 5760 @@ -18,8 +18,8 @@ all: ${FS} ${CDROM} ${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v ${FS} > vnd - disklabel -w `cat vnd` ${FSDISKTYPE} + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} -b 8192 -f 4096 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} install -c -m 555 -o root -g wheel \ diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile index f1252d0d585..0109a8f9ff0 100644 --- a/distrib/amd64/ramdiskA/Makefile +++ b/distrib/amd64/ramdiskA/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2023/04/28 08:45:25 krw Exp $ +# $OpenBSD: Makefile,v 1.19 2023/04/28 12:26:43 krw Exp $ FS= floppy${OSrev}.img FSSIZE= 2880 @@ -16,8 +16,8 @@ all: ${FS} ${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v ${FS} > vnd - disklabel -w `cat vnd` ${FSDISKTYPE} + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} -b 4096 -f 512 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} objcopy -S -R .comment ${DESTDIR}/usr/mdec/fdboot ${.OBJDIR}/boot diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile index d068c7e9104..ec649da16e4 100644 --- a/distrib/i386/iso/Makefile +++ b/distrib/i386/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2023/04/26 14:42:27 krw Exp $ +# $OpenBSD: Makefile,v 1.34 2023/04/28 12:26:43 krw Exp $ FS= install${OSrev}.img FSSIZE= 921600 @@ -22,9 +22,9 @@ all: ${FS} ${CDROM} ${FS}: ${BASE} ${XBASE} bsd.rd dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v ${FS} > vnd - fdisk -yi -l ${FSSIZE} -f ${DESTDIR}/usr/mdec/mbr `cat vnd` - disklabel -w `cat vnd` ${FSDISKTYPE} + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd + fdisk -yi -f ${DESTDIR}/usr/mdec/mbr `cat vnd` + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} -b 8192 -f 1024 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} objcopy -S -R .comment ${DESTDIR}/usr/mdec/boot ${MOUNT_POINT}/boot diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile index c4fd963d3e4..f3545915edc 100644 --- a/distrib/i386/ramdisk/Makefile +++ b/distrib/i386/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2023/04/28 08:45:25 krw Exp $ +# $OpenBSD: Makefile,v 1.20 2023/04/28 12:26:43 krw Exp $ FS= floppy${OSrev}.img FSSIZE= 2880 @@ -14,8 +14,8 @@ all: ${FS} ${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v ${FS} > vnd - disklabel -w `cat vnd` ${FSDISKTYPE} + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} -b 4096 -f 512 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} objcopy -S -R .comment ${DESTDIR}/usr/mdec/fdboot ${.OBJDIR}/boot diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile index 36b771f0d5a..9941c64ff3c 100644 --- a/distrib/i386/ramdisk_cd/Makefile +++ b/distrib/i386/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2023/04/28 08:45:25 krw Exp $ +# $OpenBSD: Makefile,v 1.31 2023/04/28 12:26:43 krw Exp $ FS= miniroot${OSrev}.img FSSIZE= 8448 @@ -15,9 +15,9 @@ all: ${FS} ${CDROM} ${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v ${FS} > vnd - fdisk -yi -l ${FSSIZE} -f ${DESTDIR}/usr/mdec/mbr `cat vnd` - disklabel -w `cat vnd` ${FSDISKTYPE} + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd + fdisk -yi -f ${DESTDIR}/usr/mdec/mbr `cat vnd` + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} -b 8192 -f 1024 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} objcopy -S -R .comment ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/boot diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile index a3548397991..ce89e86f402 100644 --- a/distrib/landisk/ramdisk/Makefile +++ b/distrib/landisk/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2023/04/28 08:45:25 krw Exp $ +# $OpenBSD: Makefile,v 1.37 2023/04/28 12:26:43 krw Exp $ FS= miniroot${OSrev}.img FSSIZE= 5120 @@ -20,7 +20,7 @@ ${FS}: bsd.gz vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd fdisk -i -y `cat vnd` fdisk -u -y -f ${DESTDIR}/usr/mdec/mbr `cat vnd` - disklabel -w `cat vnd` ${FSDISKTYPE} + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} -b 4096 -f 512 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} installboot -vr ${MOUNT_POINT} `cat vnd` \ diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index a9ca581a7e6..2dd65fa6b6c 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2023/04/28 08:45:25 krw Exp $ +# $OpenBSD: Makefile,v 1.34 2023/04/28 12:26:43 krw Exp $ FS= miniroot${OSrev}.img FSSIZE= 8192 @@ -19,8 +19,8 @@ all: ${FS} ${FS}: bsd.rd dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v ${FS} > vnd - disklabel -w `cat vnd` ${FSDISKTYPE} + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} install -c -m 555 -o root -g wheel \ diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile index 48a16d35fda..f6ab5410869 100644 --- a/distrib/sparc64/iso/Makefile +++ b/distrib/sparc64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2023/04/26 20:59:32 krw Exp $ +# $OpenBSD: Makefile,v 1.25 2023/04/28 12:26:43 krw Exp $ FS= install${OSrev}.img FSSIZE= 1032192 @@ -21,8 +21,8 @@ all: ${FS} ${CDROM} ${FS}: ${BASE} ${XBASE} dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v ${FS} > vnd - disklabel -w `cat vnd` ${FSDISKTYPE} + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} -b 8192 -f 4096 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} install -c -m 555 -o root -g wheel \ diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile index 9aa2ed62e9f..85dbd615baa 100644 --- a/distrib/sparc64/miniroot/Makefile +++ b/distrib/sparc64/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2023/04/28 08:45:25 krw Exp $ +# $OpenBSD: Makefile,v 1.31 2023/04/28 12:26:43 krw Exp $ FS= miniroot${OSrev}.img FSSIZE= 6400 @@ -18,8 +18,8 @@ all: ${FS} ${CDROM} ${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v ${FS} > vnd - disklabel -w `cat vnd` ${FSDISKTYPE} + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} -b 8192 -f 4096 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} install -c -m 555 -o root -g wheel \ diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index fe531f00c6b..1c50ef6f7c1 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2023/04/28 08:45:25 krw Exp $ +# $OpenBSD: Makefile,v 1.57 2023/04/28 12:26:43 krw Exp $ FS= floppy${OSrev}.img FSSIZE= 2880 @@ -17,8 +17,8 @@ all: ${FS} ${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v ${FS} > vnd - disklabel -w `cat vnd` ${FSDISKTYPE} + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} -b 4096 -f 512 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} install -c -m 555 -o root -g wheel \ diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index da50a1d794d..df23b7bc19c 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2023/04/28 08:45:26 krw Exp $ +# $OpenBSD: Makefile,v 1.53 2023/04/28 12:26:43 krw Exp $ FS= floppyB${OSrev}.img FSSIZE= 2880 @@ -17,8 +17,8 @@ all: ${FS} ${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v ${FS} > vnd - disklabel -w `cat vnd` ${FSDISKTYPE} + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd + echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} -b 4096 -f 512 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} install -c -m 555 -o root -g wheel \ -- 2.20.1