diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-17 00:28:22 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-17 00:28:22 +0000 |
| commit | d67cf536981fe324152c9f4f89119b8b3a7b383d (patch) | |
| tree | 0c088c5d3f1bd77f9db06173cd83167cff96d380 /distrib/luna88k | |
| parent | 81f9f199b5e2a6741e5a9a68d39dd00dadaa4e18 (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/luna88k')
| -rw-r--r-- | distrib/luna88k/ramdisk/Makefile | 4 | ||||
| -rw-r--r-- | distrib/luna88k/ramdisk/Makefile.inc | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index 2a3f0185024..a414b53ad5d 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/04/13 17:34:40 millert Exp $ +# $OpenBSD: Makefile,v 1.4 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/luna88k/ramdisk/Makefile.inc b/distrib/luna88k/ramdisk/Makefile.inc index 75cb26964ce..4c27305f502 100644 --- a/distrib/luna88k/ramdisk/Makefile.inc +++ b/distrib/luna88k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.1 2004/04/21 18:40:21 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.2 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 |