vnd driver has disklabel support now; use it

diff --git a/distrib/i386/floppies/inst-common/Makefile.inc b/distrib/i386/floppies/inst-common/Makefile.inc
index 3189bec..7b14fdc 100644 (file)
--- 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.10 1996/12/20 06:25:15 kstailey Exp $
+#      $Id: Makefile.inc,v 1.11 1996/12/21 05:20:21 deraadt Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -21,14 +21,14 @@ MTREE=              ${COMMONDIR}/mtree.conf
 all: ${CBIN}
 .ifndef FLOPPY3
        dd if=/dev/zero of=${REALIMAGE} bs=10k count=120
-       disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${REALIMAGE} floppy5
-       vnconfig -v -c ${VND_DEV} ${REALIMAGE}
-       newfs -t ffs -O -m 0 -o space -i 3000 -c 80 ${VND_RDEV} floppy5
+       vnconfig -v -c ${VND} ${REALIMAGE}
+       disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy5
+       newfs -O -m 0 -o space -i 3000 -c 80 ${VND_RDEV} floppy5
 .else
        dd if=/dev/zero of=${REALIMAGE} bs=10k count=144
-       disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${REALIMAGE} floppy3
-       vnconfig -v -c ${VND_DEV} ${REALIMAGE}
-       newfs -t ffs -O -m 0 -o space -i 3000 -c 80 ${VND_RDEV} floppy3
+       vnconfig -v -c ${VND} ${REALIMAGE}
+       disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy3
+       newfs -O -m 0 -o space -i 3000 -c 80 ${VND_RDEV} floppy3
 .endif
        mount ${VND_DEV} ${MOUNT_POINT}
        mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
@@ -38,14 +38,14 @@ all: ${CBIN}
        @df -i ${MOUNT_POINT}
        @echo ""
        umount ${MOUNT_POINT}
-       vnconfig -u ${VND_DEV}
+       vnconfig -u ${VND}
        cat /*bin/* > /dev/null
        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}

diff --git a/distrib/i386/floppies/kc/Makefile b/distrib/i386/floppies/kc/Makefile
index 5b32b54..28bebac 100644 (file)
--- a/distrib/i386/floppies/kc/Makefile
+++ b/distrib/i386/floppies/kc/Makefile
@@ -1,4 +1,4 @@
-#      $Id: Makefile,v 1.10 1996/12/20 15:35:55 kstailey Exp $
+#      $Id: Makefile,v 1.11 1996/12/21 05:20:25 deraadt Exp $
 
 TOP=           ${.CURDIR}/..
 
@@ -30,14 +30,14 @@ all: bsd ${CBIN}
 .endif
 .ifndef FLOPPY3
        dd if=/dev/zero of=${REALIMAGE} bs=10k count=120
-       disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${REALIMAGE} floppy5
-       vnconfig -v -c ${VND_DEV} ${REALIMAGE}
-       newfs -t ffs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV} floppy5
+       vnconfig -v -c ${VND} ${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=${REALIMAGE} bs=10k count=144
-       disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${REALIMAGE} floppy3
-       vnconfig -v -c ${VND_DEV} ${REALIMAGE}
-       newfs -t ffs -O -m 0 -o space -i 6500 -c 80 ${VND_RDEV} floppy3
+       vnconfig -v -c ${VND} ${REALIMAGE}
+       disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy3
+       newfs -O -m 0 -o space -i 6500 -c 80 ${VND_RDEV} floppy3
 .endif
        mount ${VND_DEV} ${MOUNT_POINT}
        mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
@@ -47,14 +47,14 @@ all: bsd ${CBIN}
        @df -i ${MOUNT_POINT}
        @echo ""
        umount ${MOUNT_POINT}
-       vnconfig -u ${VND_DEV}
+       vnconfig -u ${VND}
        cat /*bin/* > /dev/null
        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}

diff --git a/distrib/sparc/floppies/inst-common/Makefile.inc b/distrib/sparc/floppies/inst-common/Makefile.inc
index 3fe9a4c..0020d3f 100644 (file)
--- 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}

diff --git a/distrib/sparc/floppies/kernel/Makefile b/distrib/sparc/floppies/kernel/Makefile
index 5f6cb36..f98e718 100644 (file)
--- a/distrib/sparc/floppies/kernel/Makefile
+++ b/distrib/sparc/floppies/kernel/Makefile
@@ -1,4 +1,4 @@
-#      $Id: Makefile,v 1.4 1996/10/18 23:35:36 deraadt Exp $
+#      $Id: Makefile,v 1.5 1996/12/21 05:20:38 deraadt Exp $
 
 .include "../Makefile.inc"
 
@@ -22,11 +22,9 @@ bsd:
 all:   bsd
 .if ${VND} == vnd0
        dd if=/dev/zero of=${REALIMAGE} bs=10k count=144
-       vnconfig -v -c ${VND_DEV} ${REALIMAGE}
-       # fuck, disklabeling completely fails
-.else
-       disklabel -w ${VND_RDEV} floppy
+       vnconfig -v -c ${VND} ${REALIMAGE}
 .endif
+       disklabel -w ${VND} floppy
        newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV} floppy
        mount ${VND_DEV} ${MOUNT_POINT}
        sync; /usr/mdec/binstall -v ffs ${MOUNT_POINT}
@@ -36,7 +34,7 @@ all:  bsd
        df -i ${MOUNT_POINT}
        umount ${MOUNT_POINT}
 .if ${VND} == vnd0
-       vnconfig -u ${VND_DEV}
+       vnconfig -u ${VND}
        cat /bin/* > /dev/null          # flush buffer cache (yuck)
        cp ${REALIMAGE} ${IMAGE}
        rm ${REALIMAGE}
@@ -48,7 +46,9 @@ all:  bsd
 
 unconfig:
        -umount -f ${MOUNT_POINT}
-       -vnconfig -u ${VND_DEV}
+.if ${VND} == vnd0
+       -vnconfig -u ${VND}
+.endif
        -/bin/rm -f ${IMAGE}
 
 clean cleandir: