summaryrefslogtreecommitdiff
path: root/distrib/mvme88k
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-17 00:28:22 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-17 00:28:22 +0000
commitd67cf536981fe324152c9f4f89119b8b3a7b383d (patch)
tree0c088c5d3f1bd77f9db06173cd83167cff96d380 /distrib/mvme88k
parent81f9f199b5e2a6741e5a9a68d39dd00dadaa4e18 (diff)
Stop using disklabel -r. The disklabel code does not know all the semantics
for pushing disklabels onto the disk (and besides that, it is buggy and unreadable crap); thanks for help from krw
Diffstat (limited to 'distrib/mvme88k')
-rw-r--r--distrib/mvme88k/ramdisk/Makefile4
-rw-r--r--distrib/mvme88k/ramdisk/Makefile.inc3
2 files changed, 3 insertions, 4 deletions
diff --git a/distrib/mvme88k/ramdisk/Makefile b/distrib/mvme88k/ramdisk/Makefile
index 209eee71c8d..df17f96edbe 100644
--- a/distrib/mvme88k/ramdisk/Makefile
+++ b/distrib/mvme88k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2007/04/13 17:34:40 millert Exp $
+# $OpenBSD: Makefile,v 1.9 2007/06/17 00:28:21 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -45,7 +45,7 @@ rd_test: rd_setup rd_teardown
rd_setup:
dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
vnconfig -v -c ${VND} ${IMAGE}
- disklabel -w -r ${VND} ${DISKTYPE}
+ disklabel -w ${VND} ${DISKTYPE}
newfs ${NEWFSARGS} ${VND_RDEV}
fsck ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
diff --git a/distrib/mvme88k/ramdisk/Makefile.inc b/distrib/mvme88k/ramdisk/Makefile.inc
index 26e1a1b272b..a61bd38d962 100644
--- a/distrib/mvme88k/ramdisk/Makefile.inc
+++ b/distrib/mvme88k/ramdisk/Makefile.inc
@@ -1,5 +1,5 @@
#
-# $OpenBSD: Makefile.inc,v 1.7 2003/08/07 20:57:05 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2007/06/17 00:28:21 deraadt Exp $
#
# TOP is assumed to be defined by Makefile including this one.
@@ -13,7 +13,6 @@ MOUNT_POINT?= ${TOP}/${BASE}/fs
CRUNCHCONF?= ${COMMONDIR}/${CBIN}.conf
MTREE= ${UTILS}/mtree.conf
-RAWLABEL=
${CBIN}.conf: ${LISTS}
awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf