diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-02 11:41:41 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-02 11:41:41 +0000 |
| commit | 125a11922592916a824e1d6e5ae725f8842d1cd4 (patch) | |
| tree | 4e743966f3e1c8356f27e602071f3337f9813db0 /distrib/i386 | |
| parent | f4abdd2fa8b85d5452de330b088d60dec57a8afc (diff) | |
create vnd filesystem in a file in /tmp (now we assume /tmp is a non-nfs
filesystem, instead of assuming src or obj are non-nfs)
Diffstat (limited to 'distrib/i386')
| -rw-r--r-- | distrib/i386/floppies/inst-common/Makefile.inc | 13 | ||||
| -rw-r--r-- | distrib/i386/floppies/kc/Makefile | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/distrib/i386/floppies/inst-common/Makefile.inc b/distrib/i386/floppies/inst-common/Makefile.inc index 9d44e01da65..788ed65cac7 100644 --- a/distrib/i386/floppies/inst-common/Makefile.inc +++ b/distrib/i386/floppies/inst-common/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.3 1996/05/31 22:52:31 mickey Exp $ +# $Id: Makefile.inc,v 1.4 1996/06/02 11:41:36 deraadt Exp $ # TOP is assumed to be defined by Makefile including this one. @@ -10,6 +10,8 @@ VND?= vnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a IMAGE?= xxx${REV}.fs +PID!= echo $$$$ +REALIMAGE= /tmp/image.${PID} MDEC= ${DESTDIR}/usr/mdec LISTS= ${COMMONDIR}/list ${.CURDIR}/list @@ -18,12 +20,12 @@ MTREE= ${COMMONDIR}/mtree.conf all: ${CBIN} .ifndef FLOPPY3 - dd if=/dev/zero of=${IMAGE} bs=10k count=120 - vnconfig -v -c ${VND_DEV} ${IMAGE} + dd if=/dev/zero of=${REALIMAGE} bs=10k count=120 + vnconfig -v -c ${VND_DEV} ${REALIMAGE} newfs -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy5 .else - dd if=/dev/zero of=${IMAGE} bs=10k count=144 - vnconfig -v -c ${VND_DEV} ${IMAGE} + dd if=/dev/zero of=${REALIMAGE} bs=10k count=144 + vnconfig -v -c ${VND_DEV} ${REALIMAGE} newfs -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy3 .endif mount ${VND_DEV} ${MOUNT_POINT} @@ -36,6 +38,7 @@ all: ${CBIN} umount ${MOUNT_POINT} vnconfig -u ${VND_DEV} cat /*bin/* > /dev/null + cp ${REALIMAGE} ${IMAGE} unconfig: -umount -f ${MOUNT_POINT} diff --git a/distrib/i386/floppies/kc/Makefile b/distrib/i386/floppies/kc/Makefile index c1e02d9d89b..7774e5da32d 100644 --- a/distrib/i386/floppies/kc/Makefile +++ b/distrib/i386/floppies/kc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1996/05/31 23:00:23 mickey Exp $ +# $Id: Makefile,v 1.4 1996/06/02 11:41:40 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -10,6 +10,8 @@ VND?= vnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a IMAGE?= xxx-${REV}.fs +PID!= echo $$$$ +REALIMAGE!= echo /tmp/image.${PID} MDEC= ${DESTDIR}/usr/mdec LIST= ${.CURDIR}/list @@ -21,13 +23,13 @@ all: ${CBIN} .else .endif .ifndef FLOPPY3 - dd if=/dev/zero of=${IMAGE} bs=10k count=120 - vnconfig -v -c ${VND_DEV} ${IMAGE} + dd if=/dev/zero of=${REALIMAGE} bs=10k count=120 + vnconfig -v -c ${VND_DEV} ${REALIMAGE} disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy5 newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV} floppy5 .else - dd if=/dev/zero of=${IMAGE} bs=10k count=144 - vnconfig -v -c ${VND_DEV} ${IMAGE} + dd if=/dev/zero of=${REALIMAGE} bs=10k count=144 + vnconfig -v -c ${VND_DEV} ${REALIMAGE} disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy3 newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV} floppy3 .endif @@ -41,6 +43,7 @@ all: ${CBIN} umount ${MOUNT_POINT} vnconfig -u ${VND_DEV} cat /*bin/* > /dev/null + cp ${REALIMAGE} ${IMAGE} unconfig: -umount -f ${MOUNT_POINT} |