Revert amd64/i386 floppy change. Missing diff to vnconfig broke

installboot'ing due to incorrect d_type (must be 'floppy' not
'vnd') in disklabel.

Noticed by deraadt@ and sthen@

diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile
index 0109a8f..b4e5a95 100644 (file)
--- a/distrib/amd64/ramdiskA/Makefile
+++ b/distrib/amd64/ramdiskA/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.19 2023/04/28 12:26:43 krw Exp $
+#      $OpenBSD: Makefile,v 1.20 2023/04/28 18:14:59 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 -t ${FSDISKTYPE} ${FS} > vnd
-       echo '/ *' | disklabel -wAT- `cat vnd`
+       vnconfig -v ${FS} > vnd
+       disklabel -w `cat vnd` ${FSDISKTYPE}
        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/Makefile b/distrib/i386/ramdisk/Makefile
index f354591..db48815 100644 (file)
--- a/distrib/i386/ramdisk/Makefile
+++ b/distrib/i386/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.20 2023/04/28 12:26:43 krw Exp $
+#      $OpenBSD: Makefile,v 1.21 2023/04/28 18:14:59 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 -t ${FSDISKTYPE} ${FS} > vnd
-       echo '/ *' | disklabel -wAT- `cat vnd`
+       vnconfig -v ${FS} > vnd
+       disklabel -w `cat vnd` ${FSDISKTYPE}
        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