summaryrefslogtreecommitdiff
path: root/distrib/amd64
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2023-04-28 12:26:44 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2023-04-28 12:26:44 +0000
commit0e33fa30f0539596a72ba9ec503c8ca387a7698e (patch)
treee57c22f8a593ac76e1020c0f5eabe602196bf7e4 /distrib/amd64
parent8b9c0ba666d9fbece93189253980118abacc50c3 (diff)
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@
Diffstat (limited to 'distrib/amd64')
-rw-r--r--distrib/amd64/ramdiskA/Makefile6
1 files changed, 3 insertions, 3 deletions
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