summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2008-08-17 15:14:45 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2008-08-17 15:14:45 +0000
commit4c0300ad9e08841d3f27db4d7b6cdb6d8716ab3f (patch)
tree121a4d8ec81f77294fe45cb0fd1c9bcb7fdb94a8 /distrib
parent12ef535c6c2b88b0aa8490b92574e63baea7a7c0 (diff)
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@
Diffstat (limited to 'distrib')
-rw-r--r--distrib/landisk/miniroot/Makefile5
1 files 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}