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/amd64 | |
| 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/amd64')
| -rw-r--r-- | distrib/amd64/common/Makefile.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc index 37cb032eb5e..c6cdaefc841 100644 --- a/distrib/amd64/common/Makefile.inc +++ b/distrib/amd64/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.7 2007/05/19 15:52:31 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2007/06/17 00:28:21 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -29,7 +29,7 @@ all: ${FS} ${FS}: bsd.gz dd if=/dev/zero of=${REALIMAGE} bs=512 count=${FLOPPYSIZE} vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -r ${VND} ${FLOPPYTYPE} + disklabel -w ${VND} ${FLOPPYTYPE} newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV} mount ${VND_DEV} ${MOUNT_POINT} cp ${BOOT} ${.OBJDIR}/boot @@ -74,7 +74,7 @@ ${IMAGE}: ${CBIN} rd_setup do_files rd_teardown rd_setup: ${CBIN} dd if=/dev/zero of=${REALIMAGE} bs=512 count=${NBLKS} vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -r ${VND} ${DISKTYPE} + disklabel -w ${VND} ${DISKTYPE} newfs ${NEWFSARGS} ${VND_RDEV} fsck ${VND_RDEV} mount ${VND_DEV} ${MOUNT_POINT} |