diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2023-04-28 18:15:00 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2023-04-28 18:15:00 +0000 |
| commit | e01bd6acf40253ef539fb63949624a1a79593d83 (patch) | |
| tree | 94591f419419409a969d6bc8e2563de38a898f5f /distrib/i386 | |
| parent | 4e6c4eea23637f3b609b787b8493acf33a58d77d (diff) | |
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@
Diffstat (limited to 'distrib/i386')
| -rw-r--r-- | distrib/i386/ramdisk/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile index f3545915edc..db488151a16 100644 --- 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 |