diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-12-21 05:20:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-12-21 05:20:39 +0000 |
| commit | 71681c499d33f26d77340d8ea8776679eca80c47 (patch) | |
| tree | 6db912634ac9b27e84625695d6d7449b41103b88 /distrib/sparc/floppies/inst-common | |
| parent | db3bfda7efaaf87e3193d0607526c493c82d9034 (diff) | |
vnd driver has disklabel support now; use it
Diffstat (limited to 'distrib/sparc/floppies/inst-common')
| -rw-r--r-- | distrib/sparc/floppies/inst-common/Makefile.inc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/distrib/sparc/floppies/inst-common/Makefile.inc b/distrib/sparc/floppies/inst-common/Makefile.inc index 3fe9a4cd104..0020d3f86d5 100644 --- a/distrib/sparc/floppies/inst-common/Makefile.inc +++ b/distrib/sparc/floppies/inst-common/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.2 1996/10/08 19:39:52 deraadt Exp $ +# $Id: Makefile.inc,v 1.3 1996/12/21 05:20:35 deraadt Exp $ # TOP is assumed to be defined by Makefile including this one. @@ -7,8 +7,8 @@ COMMONDIR= ${TOP}/inst-common MOUNT_POINT?= /mnt VND?= vnd0 -VND_DEV= /dev/${VND}c -VND_RDEV= /dev/r${VND}c +VND_DEV= /dev/${VND}a +VND_RDEV= /dev/r${VND}a PID!= echo $$$$ REALIMAGE!= echo /tmp/image.${PID} IMAGE?= inst${REV}.fs @@ -20,7 +20,8 @@ MTREE= ${COMMONDIR}/mtree.conf all: ${CBIN} dd if=/dev/zero of=${REALIMAGE} bs=120k count=12 - vnconfig -v -c ${VND_DEV} ${REALIMAGE} + vnconfig -v -c ${VND} ${REALIMAGE} + disklabel -w ${VND} floppy3 newfs -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy mount ${VND_DEV} ${MOUNT_POINT} mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u @@ -28,14 +29,14 @@ all: ${CBIN} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS} df -i ${MOUNT_POINT} umount ${MOUNT_POINT} - vnconfig -u ${VND_DEV} + vnconfig -u ${VND} cat /bin/* > /dev/null # flush buffer cache (yuck) cp ${REALIMAGE} ${IMAGE} rm ${REALIMAGE} unconfig: -umount -f ${MOUNT_POINT} - -vnconfig -u ${VND_DEV} + -vnconfig -u ${VND} -/bin/rm -f ${IMAGE} ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} |