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@

diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile
index 5832394..ec8dff4 100644 (file)
--- 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 f1252d0..0109a8f 100644 (file)
--- 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 d068c7e..ec649da 100644 (file)
--- 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 c4fd963..f354591 100644 (file)
--- 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 36b771f..9941c64 100644 (file)
--- 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 a354839..ce89e86 100644 (file)
--- 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 a9ca581..2dd65fa 100644 (file)
--- 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 48a16d3..f6ab541 100644 (file)
--- 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 9aa2ed6..85dbd61 100644 (file)
--- 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 fe531f0..1c50ef6 100644 (file)
--- 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 da50a1d..df23b7b 100644 (file)
--- 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 \