From d30843d08c76c75d5d0379d1c8e2d24e41ac1677 Mon Sep 17 00:00:00 2001 From: krw Date: Sun, 17 Aug 2008 15:14:44 +0000 Subject: [PATCH] Force fdisk to use the same geometry as the miniroot2.5M disktab entry, the one that the disklabel will use, rather than the vnd default geometry. Lets the generated miniroot44.fs boot again. Problem found by Diana Eichart. Suggestions from drahn@. ok deraadt@ --- distrib/landisk/miniroot/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile index 8397d0768fb..ace29faf591 100644 --- a/distrib/landisk/miniroot/Makefile +++ b/distrib/landisk/miniroot/Makefile @@ -38,9 +38,8 @@ do_files: rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} vnconfig -v -c ${VND} ${IMAGE} - disklabel -w ${VND} ${DISKTYPE} - fdisk -i -y ${VND} - fdisk -u -f ${DESTDIR}/usr/mdec/mbr -y ${VND} + fdisk -i -y -c 160 -h 2 -s 16 ${VND} + fdisk -u -y -c 160 -h 2 -s 16 -f ${DESTDIR}/usr/mdec/mbr ${VND} disklabel -w ${VND} ${DISKTYPE} disklabel -v -B -b ${DESTDIR}/usr/mdec/xxboot ${VND} newfs ${NEWFSARGS} ${VND_RDEV} -- 2.20.1