diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-04-29 20:37:10 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-04-29 20:37:10 +0000 |
| commit | deee996d38a4d86ef8de31f173f2aca4566b2229 (patch) | |
| tree | f9fbe4c47bfcb44683bfea63ea5cf79de36aae55 | |
| parent | f0d21fe5d3624c798f1a3b09311062b66f1ef322 (diff) | |
Use the new style to build vnds. General 2.1 cleanup.
| -rw-r--r-- | distrib/miniroot/Makefile | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile index 90d9445a78d..9ada0b80d47 100644 --- a/distrib/miniroot/Makefile +++ b/distrib/miniroot/Makefile @@ -1,7 +1,8 @@ +# $OpenBSD: Makefile,v 1.6 1997/04/29 20:37:09 niklas Exp $ # $NetBSD: Makefile,v 1.2.4.3 1996/07/04 07:05:32 leo Exp $ -# Revision is 1.2 -REV= 20 +# Revision is 2.1 +REV= 21 CBIN= instbin ARCHDIR= ${.CURDIR}/../${MACHINE}/miniroot @@ -11,9 +12,10 @@ ARCHDIR= ${.CURDIR}/../${MACHINE}/miniroot .endif MOUNT_POINT?= /mnt -VND?= vnd0a -VND_DEV= /dev/${VND} -VND_RDEV= /dev/r${VND} +VND?= vnd0 +VND_DEV= /dev/${VND}a +VND_RDEV= /dev/r${VND}a +DISKTYPE= miniroot PID!= echo $$$$ REALIMAGE!= echo /tmp/image.${PID} IMAGE?= miniroot${REV}.fs @@ -38,8 +40,9 @@ bsd: all: ${CBIN} bsd dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE} - vnconfig -v -c ${VND_DEV} ${REALIMAGE} - newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} miniroot + vnconfig -v -c ${VND} ${REALIMAGE} + disklabel -w -r ${VND} ${DISKTYPE} + newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} ${DISKTYPE} mount ${VND_DEV} ${MOUNT_POINT} mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} ARCHDIR=${ARCHDIR} \ @@ -51,6 +54,7 @@ all: ${CBIN} bsd vnconfig -u ${VND_DEV} cat /*bin/* > /dev/null cp ${REALIMAGE} ${IMAGE} + rm ${REALIMAGE} unconfig: -umount -f ${MOUNT_POINT} |