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/miniroot | |
| 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/miniroot')
| -rw-r--r-- | distrib/miniroot/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile index b44f47c3624..7bc1d7a542f 100644 --- a/distrib/miniroot/Makefile +++ b/distrib/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2004/02/28 04:53:30 jolan Exp $ +# $OpenBSD: Makefile,v 1.28 2007/06/17 00:28:21 deraadt Exp $ REV= ${OSrev} @@ -31,7 +31,6 @@ CRUNCHGENOPTS?= LISTS= ${.CURDIR}/list ${ARCHDIR}/list CRUNCHCONF= ${CBIN}.conf MTREE= ${.CURDIR}/mtree.conf -RAWLABEL?= -r .ifndef DESTDIR all: @@ -48,7 +47,7 @@ bsd: all: ${CBIN} bsd dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE} vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w ${RAWLABEL} ${VND} ${DISKTYPE} + disklabel -w ${VND} ${DISKTYPE} newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} || ${NEWFS_WILL_FAIL} mount ${VND_DEV} ${MOUNT_POINT} mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u |