summaryrefslogtreecommitdiff
path: root/distrib/landisk
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2009-03-28 16:34:25 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2009-03-28 16:34:25 +0000
commitb5dd44220fcfd4506bd7efcd862441ec3157bf02 (patch)
tree15cef9bc5969b5515eea72b5a89be1474cfdcc98 /distrib/landisk
parent582b4c19db095f3d6bedf1c879707d8499d2b661 (diff)
Use vnconfig's -t capability to avoid specifying geometry info to
fdisk while building media. ok deraadt@
Diffstat (limited to 'distrib/landisk')
-rw-r--r--distrib/landisk/miniroot/Makefile6
-rw-r--r--distrib/landisk/ramdisk/Makefile4
2 files changed, 5 insertions, 5 deletions
diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile
index ace29faf591..4b7a0639c69 100644
--- a/distrib/landisk/miniroot/Makefile
+++ b/distrib/landisk/miniroot/Makefile
@@ -37,9 +37,9 @@ do_files:
rd_setup:
dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
- vnconfig -v -c ${VND} ${IMAGE}
- 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}
+ vnconfig -v -c -t ${DISKTYPE} ${VND} ${IMAGE}
+ fdisk -i -y ${VND}
+ fdisk -u -y -f ${DESTDIR}/usr/mdec/mbr ${VND}
disklabel -w ${VND} ${DISKTYPE}
disklabel -v -B -b ${DESTDIR}/usr/mdec/xxboot ${VND}
newfs ${NEWFSARGS} ${VND_RDEV}
diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile
index e2d54be0201..da3d98ba550 100644
--- a/distrib/landisk/ramdisk/Makefile
+++ b/distrib/landisk/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2008/12/02 03:20:57 deraadt Exp $
+# $OpenBSD: Makefile,v 1.11 2009/03/28 16:34:24 krw Exp $
REV= ${OSrev}
@@ -52,7 +52,7 @@ bsd:
rd_setup:
dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
- vnconfig -v -c ${VND} ${IMAGE}
+ vnconfig -v -c -t ${DISKTYPE} ${VND} ${IMAGE}
disklabel -w ${VND} ${DISKTYPE}
newfs ${NEWFSARGS} ${VND_RDEV}
fsck ${VND_RDEV}