disklabel the vnd

4 files changed, 26 insertions, 23 deletions

diff --git a/distrib/atari/inst-common/Makefile.inc b/distrib/atari/inst-common/Makefile.inc
index 05b5554cad4..a18dc367103 100644
--- a/distrib/atari/inst-common/Makefile.inc
+++ b/distrib/atari/inst-common/Makefile.inc
@@ -9,8 +9,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
 IMAGE?=		xxx-${REV}.fs
 MDEC=		${DESTDIR}/usr/mdec
 
@@ -20,8 +20,9 @@ MTREE=		${COMMONDIR}/mtree.conf
 
 all: ${CBIN}
 	dd if=/dev/zero of=${IMAGE} bs=18k count=60
-	vnconfig -v -c ${VND_DEV} ${IMAGE}
-	newfs -O -m 0 -o space -i 3052 -c 60 ${VND_RDEV} floppybt
+	vnconfig -v -c ${VND} ${IMAGE}
+	disklabel -w ${VND} floppybt
+	newfs -O -m 0 -o space -i 3052 -c 60 ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
@@ -30,11 +31,11 @@ all: ${CBIN}
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND_DEV}
+	vnconfig -u ${VND}
 
 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/atari/miniroot/Makefile.inc b/distrib/atari/miniroot/Makefile.inc
index d2dd2093619..554aeac27fb 100644
--- a/distrib/atari/miniroot/Makefile.inc
+++ b/distrib/atari/miniroot/Makefile.inc
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile.inc,v 1.1 1996/05/27 12:49:53 leo Exp $
 
-VND=		vnd0c
+VND=		vnd0
 IMAGESIZE?=	2160 # 512 byte blocks
 NEWFSOPTS?=	-i 3052 -c 60
diff --git a/distrib/mac68k/inst-common/Makefile.inc b/distrib/mac68k/inst-common/Makefile.inc
index c245b49f300..cf65c9084da 100644
--- a/distrib/mac68k/inst-common/Makefile.inc
+++ b/distrib/mac68k/inst-common/Makefile.inc
@@ -9,8 +9,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
 IMAGE?=		xxx-${REV}.fs
 MDEC=		${DESTDIR}/usr/mdec
 
@@ -20,8 +20,9 @@ MTREE=		${COMMONDIR}/mtree.conf
 
 all: ${CBIN}
 	dd if=/dev/zero of=${IMAGE} bs=1k count=1024
-	vnconfig -v -c ${VND_DEV} ${IMAGE}
-	newfs -m 0 -o space -i 16384 ${VND_RDEV} ram
+	vnconfig -v -c ${VND} ${IMAGE}
+	disklabel -w ${VND} ram
+	newfs -m 0 -o space -i 16384 ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
@@ -30,11 +31,11 @@ all: ${CBIN}
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND_DEV}
+	vnconfig -u ${VND}
 
 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/vax/inst-common/Makefile.inc b/distrib/vax/inst-common/Makefile.inc
index f78e43cf6ec..53f532209df 100644
--- a/distrib/vax/inst-common/Makefile.inc
+++ b/distrib/vax/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.2 1996/09/05 21:27:36 deraadt Exp $
+#	$Id: Makefile.inc,v 1.3 1996/12/22 01:52:52 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
 IMAGE?=		miniroot-${REV}.fs
 BOOTSYS=	bootroot-${REV}.fs
 MDEC=		${DESTDIR}/usr/mdec
@@ -19,8 +19,9 @@ MTREE=		${COMMONDIR}/mtree.conf
 
 all: ${CBIN} bootroot
 	dd if=/dev/zero of=${IMAGE} bs=64k count=32
-	vnconfig -v -c ${VND_DEV} ${IMAGE}
-	newfs -O -m 0 -o space -i 8192 ${VND_RDEV} miniroot
+	vnconfig -v -c ${VND} ${IMAGE}
+	disklabel -w ${VND} miniroot
+	newfs -O -m 0 -o space -i 8192 ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
@@ -29,17 +30,17 @@ all: ${CBIN} bootroot
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount -f ${MOUNT_POINT}
-	vnconfig -u ${VND_DEV}
+	vnconfig -u ${VND}
 
 bootroot: edlabel copy xxboot boot
 	dd if=/dev/zero of=${BOOTSYS} bs=64k count=4
-	vnconfig -v -c ${VND_DEV} ${BOOTSYS}
+	vnconfig -v -c ${VND} ${BOOTSYS}
 	newfs -O -m 0 -o space -i 8192 ${VND_RDEV} bootroot
-	dd if=xxboot of=/dev/rvnd0a count=16
+	dd if=xxboot of=${VND_RDEV} count=16
 	mount ${VND_DEV} ${MOUNT_POINT}
 	cp edlabel copy boot ${MOUNT_POINT}
 	umount -f ${MOUNT_POINT}
-	vnconfig -u ${VND_DEV}
+	vnconfig -u ${VND}
 
 edlabel copy xxboot boot:
 	(cd /sys/arch/vax/boot;make)
@@ -50,7 +51,7 @@ edlabel copy xxboot boot:
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND_DEV} ${IMAGE}
+	-vnconfig -u ${VND} ${IMAGE}
 	-/bin/rm -f ${IMAGE}
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}