Don't rely on the disklabel defaults or a disktab entry's ba#/fa#

values for the block/fragment sizes that some install media need.
Hoist the desired values into the newfs(8) invocations to make it
obvious non-default values are required and what the values are.

No functional change.

diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile
index 5ba5d99..fc9fabe 100644 (file)
--- a/distrib/amd64/ramdiskA/Makefile
+++ b/distrib/amd64/ramdiskA/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.16 2021/07/26 12:47:44 kn Exp $
+#      $OpenBSD: Makefile,v 1.17 2023/04/26 20:59:32 krw Exp $
 
 FS=            floppy${OSrev}.img
 FSSIZE=                2880
@@ -18,7 +18,7 @@ ${FS}: bsd.gz
        dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
        vnconfig -v ${FS} > vnd
        disklabel -w `cat vnd` ${FSDISKTYPE}
-       newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a
+       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
        installboot -v -r ${MOUNT_POINT} `cat vnd` \

diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile
index d449a7b..48a16d3 100644 (file)
--- a/distrib/sparc64/iso/Makefile
+++ b/distrib/sparc64/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.23 2021/04/11 17:18:16 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.24 2023/04/26 20:59:32 krw Exp $
 
 FS=            install${OSrev}.img
 FSSIZE=                1032192
@@ -23,7 +23,7 @@ ${FS}: ${BASE} ${XBASE}
        dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
        vnconfig -v ${FS} > vnd
        disklabel -w `cat vnd` ${FSDISKTYPE}
-       newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a
+       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 \
            ${DESTDIR}/usr/mdec/ofwboot ${MOUNT_POINT}/ofwboot

diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index 1c9f5a0..736271b 100644 (file)
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.28 2021/07/26 12:47:47 kn Exp $
+#      $OpenBSD: Makefile,v 1.29 2023/04/26 20:59:32 krw Exp $
 
 FS=            miniroot${OSrev}.img
 FSSIZE=                6400
@@ -20,7 +20,7 @@ ${FS}: bsd.gz
        dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
        vnconfig -v ${FS} > vnd
        disklabel -w `cat vnd` ${FSDISKTYPE}
-       newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a
+       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 \
            ${DESTDIR}/usr/mdec/ofwboot ${MOUNT_POINT}/ofwboot

diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 93f71ee..f5ed652 100644 (file)
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.54 2021/07/26 12:47:47 kn Exp $
+#      $OpenBSD: Makefile,v 1.55 2023/04/26 20:59:32 krw Exp $
 
 FS=            floppy${OSrev}.img
 FSSIZE=                2880
@@ -19,7 +19,7 @@ ${FS}: bsd.gz
        dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
        vnconfig -v ${FS} > vnd
        disklabel -w `cat vnd` ${FSDISKTYPE}
-       newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a
+       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 \
            ${DESTDIR}/usr/mdec/ofwboot ${MOUNT_POINT}/ofwboot

diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 355fb7d..cae6dbe 100644 (file)
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.50 2021/07/26 12:47:47 kn Exp $
+#      $OpenBSD: Makefile,v 1.51 2023/04/26 20:59:32 krw Exp $
 
 FS=            floppyB${OSrev}.img
 FSSIZE=                2880
@@ -19,7 +19,7 @@ ${FS}: bsd.gz
        dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
        vnconfig -v ${FS} > vnd
        disklabel -w `cat vnd` ${FSDISKTYPE}
-       newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a
+       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 \
            ${DESTDIR}/usr/mdec/ofwboot ${MOUNT_POINT}/ofwboot