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@

diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile
index 8397d07..ace29fa 100644 (file)
--- 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}