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/alpha | |
| 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/alpha')
| -rw-r--r-- | distrib/alpha/bsd.rd/Makefile | 4 | ||||
| -rw-r--r-- | distrib/alpha/common/Makefile.inc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile index 50d65826941..24ce4f940ad 100644 --- a/distrib/alpha/bsd.rd/Makefile +++ b/distrib/alpha/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2007/04/13 17:34:39 millert Exp $ +# $OpenBSD: Makefile,v 1.11 2007/06/17 00:28:20 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -63,7 +63,7 @@ elfrdsetroot: ${TOP}/../common/elfrdsetroot.c do_prep: dd if=/dev/zero of=${REALIMAGE} count=${NBLKS} vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -r ${VND} ${DISKTYPE} + disklabel -w ${VND} ${DISKTYPE} do_mount: newfs ${NEWFSARGS} ${NEWFSARGS_RD} -s ${NBLKS} ${VND_RDEV} diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc index e39e3661c47..4e537d9e12a 100644 --- a/distrib/alpha/common/Makefile.inc +++ b/distrib/alpha/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.17 2007/04/16 03:04:05 drahn Exp $ +# $OpenBSD: Makefile.inc,v 1.18 2007/06/17 00:28:21 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -43,7 +43,7 @@ NEWFSARGS_FD= -i 524288 -c ${FLOPPYBLKS} ${FLOPPY}: bsd.gz dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYBLKS} vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -r ${VND} ${FLOPPYTYPE} + disklabel -w ${VND} ${FLOPPYTYPE} newfs ${NEWFSARGS} ${NEWFSARGS_FD} -s ${FLOPPYBLKS} ${VND_RDEV} mount ${VND_DEV} ${MOUNT_POINT} dd if=${DESTDIR}/${BOOT} of=${MOUNT_POINT}/boot bs=512 @@ -87,7 +87,7 @@ elfrdsetroot: ${TOP}/../common/elfrdsetroot.c do_prep: dd if=/dev/zero of=${REALIMAGE} count=${NBLKS} vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -r ${VND} ${DISKTYPE} + disklabel -w ${VND} ${DISKTYPE} do_mount: newfs ${NEWFSARGS} ${NEWFSARGS_RD} -s ${NBLKS} ${VND_RDEV} |