Use new vnconfig vnd-auto-allocate mode. Resolve some variation between

architectures, and start removing some crazy junk that has collected
over the years.  Being tested on all architectures...
ok various people.

30 files changed, 354 insertions, 497 deletions

diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 517928d4b55..13d32e1a730 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.32 2019/04/14 14:07:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.33 2019/04/28 14:48:08 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -8,8 +8,6 @@ IMAGE=		ramdisk${REV}.fs
 STRIPOPTS?=	-R .SUNW_ctf -R .shstrtab
 GZIPFLAGS?=	-9fn
 
-RAMDISK=	RAMDISKBIG
-
 .include "${TOP}/inst-common/Makefile.inc"
 
 LISTS+=		${.CURDIR}/list.local
@@ -30,9 +28,9 @@ bsd.rd_unz: bsd ${IMAGE}
 	strip -R .SUNW_ctf -R .shstrtab bsd.rd_unz
 
 bsd:
-	cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \
+	cd ${.CURDIR}/../../../sys/arch/alpha/compile/RAMDISKBIG && \
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
-	cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/obj/bsd bsd
+	cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/RAMDISKBIG/obj/bsd bsd
 
 ${IMAGE}: ${CBIN}
 	rm -rf $@.d
diff --git a/distrib/alpha/cdfs/Makefile b/distrib/alpha/cdfs/Makefile
index e5703464f18..73e7bba8f0b 100644
--- a/distrib/alpha/cdfs/Makefile
+++ b/distrib/alpha/cdfs/Makefile
@@ -1,10 +1,11 @@
-#	$OpenBSD: Makefile,v 1.8 2011/04/18 16:52:09 thib Exp $
+#	$OpenBSD: Makefile,v 1.9 2019/04/28 14:48:09 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
 CDROM=		cd${OSrev}.iso
+MOUNT_POINT=	/mnt
 
 all: ${CDROM}
 
@@ -27,14 +28,15 @@ ${CDROM}:
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
 	    -V "OpenBSD/${MACHINE}   ${OSREV} boot-only CD" \
 	    ${.OBJDIR}/cd-dir 2>&1) | tee log
-	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
-	mount -t cd9660 /dev/vnd0a /mnt
+	vnconfig -v ${CDROM} > vnd
+	mount -t cd9660 /dev/`cat vnd`a ${MOUNT_POINT}
 	/usr/mdec/installboot -v \
 	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
 	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
-	    /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rvnd0c
-	umount /mnt
-	vnconfig -u vnd0
+	    ${MOUNT_POINT}/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx `cat vnd`
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 .ifdef RELEASEDIR
 install:
@@ -46,8 +48,8 @@ clean cleandir:
 	rm -rf cd-dir log
 
 unconfig:
-	-umount /mnt
-	-vnconfig -u vnd0
+	-umount -f ${MOUNT_POINT}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index d5c1dccfa5d..99c4ed06e7b 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.37 2019/04/14 14:07:07 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.38 2019/04/28 14:48:09 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -7,13 +7,6 @@ IMAGE=		ramdisk${REV}.fs
 
 MOUNT_POINT=	/mnt
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
-
 STRIPOPTS?=	-R .SUNW_ctf -R .shstrtab
 GZIPFLAGS?=	-9fn
 INSTALLBOOT?=	/usr/mdec/installboot -v
@@ -39,27 +32,20 @@ NEWFSARGS_FD=	-i 524288 -c ${FLOPPYBLKS}
 CLEANFILES+=	bsd bsd.rd bsd.gz ${FLOPPY}
 
 ${FLOPPY}:	bsd.gz
-	dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYBLKS}
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	disklabel -w ${VND} ${FLOPPYTYPE}
-	newfs ${NEWFSARGS} ${NEWFSARGS_FD} -s ${FLOPPYBLKS} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	dd if=/dev/zero of=${FLOPPY} count=${FLOPPYBLKS}
+	vnconfig -v ${FLOPPY} > vnd
+	disklabel -w `cat vnd` ${FLOPPYTYPE}
+	newfs ${NEWFSARGS} ${NEWFSARGS_FD} -s ${FLOPPYBLKS} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 	dd if=${DESTDIR}/${BOOT} of=${MOUNT_POINT}/boot bs=512
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
-	${INSTALLBOOT} ${MOUNT_POINT}/boot ${BOOTXX} ${VND_CRDEV}
+	${INSTALLBOOT} ${MOUNT_POINT}/boot ${BOOTXX} `cat vnd`
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
-	@cmp ${DESTDIR}/${BOOT} ${MOUNT_POINT}/boot || echo "Warning! /boot corrupted!!!"
-	@cmp bsd.gz ${MOUNT_POINT}/bsd || echo "Warning! /bsd corrupted!!!"
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	if test `env BLOCKSIZE=512 du -s ${REALIMAGE} | cut -f1` -eq ${FLOPPYBLKS}; then \
-	    mv ${REALIMAGE} ${FLOPPY} ; \
-	else \
-	    dd if=${REALIMAGE} of=${FLOPPY} count=${FLOPPYBLKS} ; \
-	    rm -f ${REALIMAGE} ; \
-	fi
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 bsd.gz:	bsd.rd
 	objcopy -Sg -R .comment -R .SUNW_ctf -R .shstrtab -R .shstrtab bsd.rd bsd.strip
@@ -86,8 +72,8 @@ ${IMAGE}: ${CBIN}
 	makefs ${MAKEFSARGS_RD} $@ $@.d
 
 unconfig:
-	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	-umount -f ${MOUNT_POINT}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .ifdef RELEASEDIR
 beforeinstall:
diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile
index 82dbd82adef..4baa75824d9 100644
--- a/distrib/alpha/iso/Makefile
+++ b/distrib/alpha/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2014/09/21 13:44:44 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.16 2019/04/28 14:48:09 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -7,6 +7,7 @@ TOP=	${.CURDIR}/..
 CDROM=		install${OSrev}.iso
 RELXDIR?=	/home/relx-${MACHINE}
 RELDIR?=	/home/rel-${MACHINE}
+MOUNT_POINT=	/mnt
 
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
@@ -41,14 +42,15 @@ ${CDROM}: ${BASE} ${XBASE}
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
 	    -V "OpenBSD/${MACHINE}   ${OSREV} Install CD" \
 	    ${.OBJDIR}/cd-dir 2>&1) | tee log
-	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
-	mount -t cd9660 /dev/vnd0a /mnt
+	vnconfig -v ${CDROM} > vnd
+	mount -t cd9660 /dev/`cat vnd`a ${MOUNT_POINT}
 	/usr/mdec/installboot -v \
 	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
 	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
-	    /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rvnd0c
-	umount /mnt
-	vnconfig -u vnd0
+	    ${MOUNT_POINT}/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx `cat vnd`
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 install:
 	cp ${CDROM} ${RELDIR}/
@@ -58,8 +60,8 @@ clean cleandir:
 	rm -rf cd-dir log
 
 unconfig:
-	-umount /mnt
-	-vnconfig -u vnd0
+	-umount -f ${MOUNT_POINT}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile
index ffaedf4ae85..1f38b3ec265 100644
--- a/distrib/alpha/miniroot/Makefile
+++ b/distrib/alpha/miniroot/Makefile
@@ -1,63 +1,66 @@
-#	$OpenBSD: Makefile,v 1.3 2015/09/19 10:44:43 miod Exp $
+#	$OpenBSD: Makefile,v 1.4 2019/04/28 14:48:09 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-TARGET=miniroot${REV}.fs
+FS=		miniroot${REV}.fs
+MOUNT_POINT=	/mnt
 
 .ifndef DESTDIR
-all ${TARGET}:
+all ${FS}:
 	@echo setenv DESTDIR before making a ramdisk!
 	@false
 .else
 
-all: ${TARGET}
+all: ${FS}
 
-${TARGET}: vn_up install_files installboot showit vn_down
+${FS}: vn_up install_files installboot showit vn_down
 
 vn_up: blank_filesystem
-	vnconfig vnd0 ${TARGET}
-	disklabel -w vnd0 fakeramdisk
-	newfs -m 0 /dev/rvnd0a
-	mount /dev/vnd0a /mnt
+	vnconfig -v ${FS} > vnd
+	disklabel -w `cat vnd` fakeramdisk
+	newfs -m 0 /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 showit:
-	df -ki /mnt
+	df -ki ${MOUNT_POINT}
 
 vn_down:
-	-umount /mnt
-	-vnconfig -u vnd0
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 install_files: bsd.rd boot
 
 bsd.rd:
 	install -c -m 555 -o root -g wheel \
-	    ${.OBJDIR}/../bsd.rd/bsd.rd /mnt/bsd
+	    ${.OBJDIR}/../bsd.rd/bsd.rd ${MOUNT_POINT}/bsd
 
 boot:
 	install -c -m 555 -o root -g wheel \
-	    ${DESTDIR}/usr/mdec/boot /mnt/boot
+	    ${DESTDIR}/usr/mdec/boot ${MOUNT_POINT}/boot
 
 installboot:
-	/usr/mdec/installboot -v /mnt/boot ${DESTDRIR}/usr/mdec/bootxx /dev/rvnd0c
+	/usr/mdec/installboot -v ${MOUNT_POINT}/boot \
+	    ${DESTDRIR}/usr/mdec/bootxx `cat vnd`
 
 blank_filesystem:
-	dd if=/dev/zero of=${TARGET} bs=512 count=5760
+	dd if=/dev/zero of=${FS} bs=512 count=5760
 
 .endif
 
 unconfig:
-	-umount -f /mnt
-	-vnconfig -u /dev/vnd0a
+	-umount -f ${MOUNT_POINT}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .ifdef RELEASEDIR
 install:
-	cp ${TARGET} ${RELEASEDIR}
+	cp ${FS} ${RELEASEDIR}
 .endif
 
 clean:
-	rm -f ${TARGET}
+	rm -f ${FS}
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index 57216582bd0..fb97a523fb7 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.22 2019/03/05 23:26:53 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.23 2019/04/28 14:48:09 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -10,8 +10,6 @@ FS=		install${REV}.fs
 FSSIZE=		921536
 FSTYPE=		install360
 
-RAMDISK=	RAMDISK_CD
-
 MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
@@ -26,16 +24,8 @@ BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
 		${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-VND_IDEV=	/dev/${VND}i
-VND_IRDEV=	/dev/r${VND}i
 BOOT?=		${DESTDIR}/usr/mdec/boot
 EFIBOOT?=	${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
 MSDOSSIZE=	960
 TOTALSIZE!=	expr ${FSSIZE} + ${MSDOSSIZE}
 TEMPLATE=	${.CURDIR}/template
@@ -43,26 +33,26 @@ TEMPLATE=	${.CURDIR}/template
 all: ${CDROM} ${FS}
 
 ${FS}: ${BASE} ${XBASE} bsd.gz
-	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${TOTALSIZE}
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	fdisk -yi -l ${FSSIZE} -b ${MSDOSSIZE} -f ${DESTDIR}/usr/mdec/mbr ${VND}
+	dd if=/dev/zero of=${FS} bs=512 count=${TOTALSIZE}
+	vnconfig -v ${FS} > vnd
+	fdisk -yi -l ${FSSIZE} -b ${MSDOSSIZE} -f ${DESTDIR}/usr/mdec/mbr `cat vnd`
 .ifdef TEMPLATE
-	disklabel -wAT ${TEMPLATE} ${VND}
-	newfs -t msdos ${VND_IRDEV}
-	mount ${VND_IDEV} ${MOUNT_POINT}
+	disklabel -wAT ${TEMPLATE} `cat vnd`
+	newfs -t msdos /dev/r`cat vnd`i
+	mount /dev/`cat vnd`i ${MOUNT_POINT}
 	mkdir -p ${MOUNT_POINT}/efi/boot
 	cp ${EFIBOOT} ${MOUNT_POINT}/efi/boot
 	umount ${MOUNT_POINT}
 .else
-	disklabel -w ${VND} ${FSTYPE}
+	disklabel -w `cat vnd` ${FSTYPE}
 .endif
-	newfs -m 0 -o space -i 524288 -c ${FSSIZE} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	newfs -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 	cp ${BOOT} ${MOUNT_POINT}/boot
 	strip ${MOUNT_POINT}/boot
 	strip -R .comment -R .SUNW_ctf ${MOUNT_POINT}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
-	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
+	installboot -v -r ${MOUNT_POINT} `cat vnd` \
 	    ${DESTDIR}/usr/mdec/biosboot ${MOUNT_POINT}/boot
 	mkdir -p ${MOUNT_POINT}/${OSREV}/${MACHINE}
 	mkdir -p ${MOUNT_POINT}/etc
@@ -79,9 +69,8 @@ ${FS}: ${BASE} ${XBASE} bsd.gz
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	cp ${REALIMAGE} ${FS}
-	rm ${REALIMAGE}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 ${CDROM}: ${BASE} ${XBASE}
 	-rm -rf ${.OBJDIR}/cd-dir
diff --git a/distrib/amd64/ramdiskA/Makefile.inc b/distrib/amd64/ramdiskA/Makefile.inc
index fdb9e5341e0..282d9122f83 100644
--- a/distrib/amd64/ramdiskA/Makefile.inc
+++ b/distrib/amd64/ramdiskA/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2019/04/14 14:07:07 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2019/04/28 14:48:10 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -10,14 +10,6 @@ MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
 FS?=		floppy${REV}.fs
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-VND_IDEV=	/dev/${VND}i
-VND_IRDEV=	/dev/r${VND}i
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
 BOOT?=		${DESTDIR}/usr/mdec/boot
 EFIBOOT?=	${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI
 FLOPPYSIZE?=	2880
@@ -26,38 +18,36 @@ FLOPPYTYPE?=	floppy3
 all:	${FS}
 
 ${FS}:	bsd.gz
-	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${FLOPPYSIZE}
-	vnconfig -v -c ${VND} ${REALIMAGE}
+	dd if=/dev/zero of=${FS} bs=512 count=${FLOPPYSIZE}
+	vnconfig -v ${FS} > vnd
 .ifdef TEMPLATE
-	disklabel -wAT ${TEMPLATE} ${VND}
-	newfs -t msdos ${VND_IRDEV}
-	mount ${VND_IDEV} ${MOUNT_POINT}
+	disklabel -wAT ${TEMPLATE} `cat vnd`
+	newfs -t msdos /dev/r`cat vnd`i
+	mount /dev/`cat vnd`i ${MOUNT_POINT}
 	mkdir -p ${MOUNT_POINT}/efi/boot
 	cp ${EFIBOOT} ${MOUNT_POINT}/efi/boot
 	umount ${MOUNT_POINT}
 .else
-	disklabel -w ${VND} ${FLOPPYTYPE}
+	disklabel -w `cat vnd` ${FLOPPYTYPE}
 .endif
-	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 	cp ${BOOT} ${.OBJDIR}/boot
 	strip ${.OBJDIR}/boot
 	strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot
-	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
+	installboot -v -r ${MOUNT_POINT} `cat vnd` \
 	    ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	cp ${REALIMAGE} ${FS}
-	rm ${REALIMAGE}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 DISKTYPE=	rdroot
 MAKEFSARGS_RD=	-o disklabel=${DISKTYPE},minfree=0,density=4096
diff --git a/distrib/amd64/ramdisk_cd/Makefile.inc b/distrib/amd64/ramdisk_cd/Makefile.inc
index bd78f227ece..d2d6b0be6b5 100644
--- a/distrib/amd64/ramdisk_cd/Makefile.inc
+++ b/distrib/amd64/ramdisk_cd/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2019/04/14 14:07:07 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2019/04/28 14:48:10 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -10,14 +10,6 @@ MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
 FS?=		miniroot${REV}.fs
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-VND_IDEV=	/dev/${VND}i
-VND_IRDEV=	/dev/r${VND}i
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
 BOOT?=		${DESTDIR}/usr/mdec/boot
 EFIBOOT?=	${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI
 FLOPPYSIZE?=	2880
@@ -26,41 +18,39 @@ FLOPPYTYPE?=	floppy3
 all:	${FS}
 
 ${FS}:	bsd.gz
-	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${FLOPPYSIZE}
-	vnconfig -v -c ${VND} ${REALIMAGE}
+	dd if=/dev/zero of=${FS} bs=512 count=${FLOPPYSIZE}
+	vnconfig -v ${FS} > vnd
 .ifdef LBA
-	fdisk -yi -l ${FLOPPYSIZE} -b 960 -f ${DESTDIR}/usr/mdec/mbr ${VND}
+	fdisk -yi -l ${FLOPPYSIZE} -b 960 -f ${DESTDIR}/usr/mdec/mbr `cat vnd`
 .endif
 .ifdef TEMPLATE
-	disklabel -wAT ${TEMPLATE} ${VND}
-	newfs -t msdos ${VND_IRDEV}
-	mount ${VND_IDEV} ${MOUNT_POINT}
+	disklabel -wAT ${TEMPLATE} `cat vnd`
+	newfs -t msdos /dev/r`cat vnd`i
+	mount /dev/`cat vnd`i ${MOUNT_POINT}
 	mkdir -p ${MOUNT_POINT}/efi/boot
 	cp ${EFIBOOT} ${MOUNT_POINT}/efi/boot
 	umount ${MOUNT_POINT}
 .else
-	disklabel -w ${VND} ${FLOPPYTYPE}
+	disklabel -w `cat vnd` ${FLOPPYTYPE}
 .endif
-	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 	cp ${BOOT} ${.OBJDIR}/boot
 	strip ${.OBJDIR}/boot
 	strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot
-	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
+	installboot -v -r ${MOUNT_POINT} `cat vnd` \
 	    ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	cp ${REALIMAGE} ${FS}
-	rm ${REALIMAGE}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 DISKTYPE?=	rdroot
 MAKEFSARGS_RD=	-o disklabel=${DISKTYPE},minfree=0,density=4096
@@ -89,9 +79,10 @@ mr.fs: instbin
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
 	makefs ${MAKEFSARGS_RD} $@ $@.d
-	vnconfig -v -c ${VND} mr.fs
-	df -i /dev/${VND}a
-	vnconfig -u ${VND}
+	vnconfig -v mr.fs > vnd
+	df -i /dev/`cat vnd`a
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 .ifdef RELEASEDIR
 install:
diff --git a/distrib/arm64/miniroot/Makefile b/distrib/arm64/miniroot/Makefile
index a418daca7df..c9763b0f516 100644
--- a/distrib/arm64/miniroot/Makefile
+++ b/distrib/arm64/miniroot/Makefile
@@ -5,15 +5,6 @@ IMAGE=	miniroot${REV}.fs
 
 MOUNT_POINT=	/mnt
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_CDEV=	/dev/${VND}c
-VND_IDEV=	/dev/${VND}i
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-VND_RIDEV=	/dev/r${VND}i
-PID!=		echo $$$$
-
 DISKTYPE=	miniroot
 NBLKS=		43008
 MSDOSSTART=	8192
@@ -57,7 +48,7 @@ do_files:
 	cp ${.OBJDIR}/../ramdisk/bsd.rd ${MOUNT_POINT}/bsd.rd
 	ln ${MOUNT_POINT}/bsd.rd ${MOUNT_POINT}/bsd
 	-umount ${MOUNT_POINT}
-	mount ${MOUNT_ARGS_msdos} ${VND_IDEV} ${MOUNT_POINT}
+	mount ${MOUNT_ARGS_msdos} /dev/`cat vnd`i ${MOUNT_POINT}
 .for FILE in ${PIFILES}
 	cp ${PRPI}/${FILE} ${MOUNT_POINT}/
 .endfor
@@ -67,27 +58,27 @@ do_files:
 	echo bootaa64.efi > ${MOUNT_POINT}/efi/boot/startup.nsh
 	echo 'arm_64bit=1\nenable_uart=1\ndevice_tree_address=0x02600000\nkernel=u-boot.bin' > ${MOUNT_POINT}/config.txt
 	dd if=${PUBOOT}/pine64_plus/u-boot-sunxi-with-spl.bin \
-	    of=${VND_CDEV} bs=1024 seek=8
+	    of=/dev/r`cat vnd`c bs=1024 seek=8
 
 rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
-	vnconfig -v -c -t ${DISKTYPE} ${VND} ${IMAGE}
+	vnconfig -v -t ${DISKTYPE} ${IMAGE} > vnd
 	echo 'u\ne 0\n${PART_ID}\nn\n${MSDOSSTART}\n${MSDOSSIZE}\ne 3\nA6\nn\n${FFSSTART}\n*\nf 0\nw\nq\n' \
-	    | fdisk -e ${VND} >/dev/null
-	echo 'a a\n\n\n\nw\nq\n' | disklabel -E ${VND} >/dev/null
-	newfs -t msdos ${NEWFS_ARGS_msdos} ${VND_RIDEV}
-	newfs -m 0 -o space -i 4096 ${VND_RDEV}
-	fsck ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	    | fdisk -e `cat vnd` >/dev/null
+	echo 'a a\n\n\n\nw\nq\n' | disklabel -E `cat vnd` >/dev/null
+	newfs -t msdos ${NEWFS_ARGS_msdos} /dev/r`cat vnd`i
+	newfs -m 0 -o space -i 4096 /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
 	@df -i ${MOUNT_POINT}
-	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .PRECIOUS:	${IMAGE}
 
diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc
index df78934534a..299cd01f402 100644
--- a/distrib/armv7/miniroot/Makefile.inc
+++ b/distrib/armv7/miniroot/Makefile.inc
@@ -6,15 +6,6 @@ MKUBOOT?=	mkuboot
 
 MOUNT_POINT=	/mnt
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_CDEV=	/dev/${VND}c
-VND_IDEV=	/dev/${VND}i
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-VND_RIDEV=	/dev/r${VND}i
-PID!=		echo $$$$
-
 DISKTYPE=	miniroot
 NBLKS=		36864
 MSDOSSTART=	2048
@@ -49,7 +40,7 @@ do_files:
 	cp ${.OBJDIR}/../../ramdisk/bsd.rd ${MOUNT_POINT}/bsd.rd
 	ln ${MOUNT_POINT}/bsd.rd ${MOUNT_POINT}/bsd
 	-umount ${MOUNT_POINT}
-	mount ${MOUNT_ARGS_msdos} ${VND_IDEV} ${MOUNT_POINT}
+	mount ${MOUNT_ARGS_msdos} /dev/`cat vnd`i ${MOUNT_POINT}
 .for DTB in ${DTBS}
 	cp ${PDTB}/${DTB} ${MOUNT_POINT}/
 .endfor
@@ -61,35 +52,35 @@ do_files:
 	    ${.CURDIR}/../boot.cmd ${MOUNT_POINT}/6x_bootscript
 .endif
 .if ${BOARD} == "cubox" || ${BOARD} == "wandboard"
-	dd if=${PUBOOT}/${UBOOT}/SPL of=${VND_CDEV} bs=1024 seek=1
-	dd if=${PUBOOT}/${UBOOT}/u-boot.img of=${VND_CDEV} bs=1024 seek=69
+	dd if=${PUBOOT}/${UBOOT}/SPL of=/dev/r`cat vnd`c bs=1024 seek=1
+	dd if=${PUBOOT}/${UBOOT}/u-boot.img of=/dev/r`cat vnd`c bs=1024 seek=69
 .endif
 .if ${PLATFORM} == "SUNXI"
 	dd if=${PUBOOT}/${UBOOT}/u-boot-sunxi-with-spl.bin \
-	    of=${VND_CDEV} bs=1024 seek=8
+	    of=/dev/r`cat vnd`c bs=1024 seek=8
 .endif
 	mkdir -p ${MOUNT_POINT}/efi/boot
 	cp /usr/mdec/BOOTARM.EFI ${MOUNT_POINT}/efi/boot/bootarm.efi
 
 rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
-	vnconfig -v -c -t ${DISKTYPE} ${VND} ${IMAGE}
+	vnconfig -v -t ${DISKTYPE} ${IMAGE} > vnd
 	echo 'u\ne 0\n${PART_ID}\nn\n${MSDOSSTART}\n${MSDOSSIZE}\ne 3\nA6\nn\n${FFSSTART}\n*\nf 0\nw\nq\n' \
-	    | fdisk -e ${VND} >/dev/null
-	echo 'a a\n\n\n\nw\nq\n' | disklabel -E ${VND} >/dev/null
-	newfs -t msdos ${NEWFS_ARGS_msdos} ${VND_RIDEV}
-	newfs -m 0 -o space -i 4096 ${VND_RDEV}
-	fsck ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	    | fdisk -e `cat vnd` >/dev/null
+	echo 'a a\n\n\n\nw\nq\n' | disklabel -E `cat vnd` >/dev/null
+	newfs -t msdos ${NEWFS_ARGS_msdos} /dev/r`cat vnd`i
+	newfs -m 0 -o space -i 4096 /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
-	@df -i ${MOUNT_POINT}
-	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	df -i ${MOUNT_POINT}
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .PRECIOUS:	${IMAGE}
 
diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile
index 7947309282f..5ffa812558b 100644
--- a/distrib/hppa/iso/Makefile
+++ b/distrib/hppa/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2014/09/21 13:44:44 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.15 2019/04/28 14:48:10 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -47,8 +47,5 @@ install:
 clean cleandir:
 	/bin/rm -rf cd-dir ${CDROM}
 
-unconfig:
-	-vnconfig -u vnd0
-
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index e775f740c5e..3a338a53b0f 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.36 2019/04/05 21:08:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.37 2019/04/28 14:48:10 deraadt Exp $
 
 CBIN=		instbin
 ARCHDIR=	${.CURDIR}/..
@@ -12,7 +12,7 @@ SRCDIR=		${.CURDIR}/../../..
 
 IMAGE?=		ramdisk${REV}.fs
 CRUNCHGENOPTS?=-E
-KERNEL?=	RAMDISK
+RAMDISK?=	RAMDISK
 UTILS?=		${.CURDIR}/../../miniroot
 
 LISTS=		${ARCHDIR}/list ${.CURDIR}/list.local
@@ -48,9 +48,9 @@ ${CDROM}: bsd ${CDBOOT}
 	dd if=/dev/zero bs=64k count=1 >> ${.OBJDIR}/${CDROM}
 
 obsd:
-	cd ${SRCDIR}/sys/arch/${MACHINE}/compile/${KERNEL} && \
+	cd ${SRCDIR}/sys/arch/${MACHINE}/compile/${RAMDISK} && \
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}'
-	cp -p ${SRCDIR}/sys/arch/${MACHINE}/compile/${KERNEL}/obj/bsd obsd
+	cp -p ${SRCDIR}/sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd obsd
 
 bsd.rd:	obsd ${IMAGE}
 	cp obsd bsd.rd
@@ -69,9 +69,10 @@ ${IMAGE}: ${CBIN}
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/${CBIN}
 	makefs ${MAKEFSARGS_RD} $@ $@.d
-	vnconfig -v -c vnd0 $@
-	df -i /dev/vnd0a
-	vnconfig -u vnd0
+	vnconfig -v ${IMAGE} > vnd
+	df -i /dev/`cat vnd`a
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 ${CBIN}.conf: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index f273eca67a6..cac41e8abbb 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.46 2019/04/14 14:07:07 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.47 2019/04/28 14:48:10 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -14,12 +14,6 @@ MTREE=		${UTILS}/mtree.conf
 
 XNAME?=		floppy
 FS?=		${XNAME}${REV}.fs
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
 BOOT?=		${DESTDIR}/usr/mdec/boot
 FLOPPYSIZE?=	2880
 FLOPPYTYPE?=	floppy3
@@ -27,31 +21,30 @@ FLOPPYTYPE?=	floppy3
 all:	${FS}
 
 ${FS}:	bsd.gz
-	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${FLOPPYSIZE}
-	vnconfig -v -c ${VND} ${REALIMAGE}
+	dd if=/dev/zero of=${FS} bs=512 count=${FLOPPYSIZE}
+	vnconfig -v ${FS} > vnd
 .ifdef LBA
-	fdisk -yi -l ${FLOPPYSIZE} -f ${DESTDIR}/usr/mdec/mbr ${VND}
+	fdisk -yi -l ${FLOPPYSIZE} -f ${DESTDIR}/usr/mdec/mbr `cat vnd`
 .endif
-	disklabel -w ${VND} ${FLOPPYTYPE}
-	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	disklabel -w `cat vnd` ${FLOPPYTYPE}
+	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 	cp ${BOOT} ${.OBJDIR}/boot
 	strip ${.OBJDIR}/boot
 	strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot
-	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
+	installboot -v -r ${MOUNT_POINT} `cat vnd` \
 	    ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	cp ${REALIMAGE} ${FS}
-	rm ${REALIMAGE}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 
 DISKTYPE?=	rdroot
@@ -81,9 +74,10 @@ ${IMAGE}: ${CBIN}
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/${CBIN}
 	makefs ${MAKEFSARGS_RD} $@ $@.d
-	vnconfig -v -c ${VND} mr.fs
-	df -i /dev/${VND}a
-	vnconfig -u ${VND}
+	vnconfig -v mr.fs > vnd
+	df -i /dev/`cat vnd`a
+	vnconfig -u `cat vnd`
+	-rm -f vnd
 
 .ifdef RELEASEDIR
 install:
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 7f8aa8cd91f..13227fda7af 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2019/03/05 23:26:53 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.16 2019/04/28 14:48:10 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -10,8 +10,6 @@ FS=		install${REV}.fs
 FSSIZE=		921600
 FSTYPE=		install360
 
-RAMDISK=	RAMDISK_CD
-
 MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
@@ -26,27 +24,21 @@ BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
 		${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
 BOOT?=		${DESTDIR}/usr/mdec/boot
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
 
 all: ${CDROM} ${FS}
 
 ${FS}: ${BASE} ${XBASE} bsd.gz
-	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${FSSIZE}
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	fdisk -yi -l ${FSSIZE} -f ${DESTDIR}/usr/mdec/mbr ${VND}
-	disklabel -w ${VND} ${FSTYPE}
-	newfs -m 0 -o space -i 524288 -c ${FSSIZE} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
+	vnconfig -v ${FS} > vnd
+	fdisk -yi -l ${FSSIZE} -f ${DESTDIR}/usr/mdec/mbr `cat vnd`
+	disklabel -w `cat vnd` ${FSTYPE}
+	newfs -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 	cp ${BOOT} ${MOUNT_POINT}/boot
 	strip -R .comment -R .SUNW_ctf ${MOUNT_POINT}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
-	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
+	installboot -v -r ${MOUNT_POINT} `cat vnd` \
 	    ${DESTDIR}/usr/mdec/biosboot ${MOUNT_POINT}/boot
 	mkdir -p ${MOUNT_POINT}/${OSREV}/${MACHINE}
 	mkdir -p ${MOUNT_POINT}/etc
@@ -63,9 +55,8 @@ ${FS}: ${BASE} ${XBASE} bsd.gz
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	cp ${REALIMAGE} ${FS}
-	rm ${REALIMAGE}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 ${CDROM}: ${BASE} ${XBASE}
 	-rm -rf ${.OBJDIR}/cd-dir
diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile
index c3b8c88f9aa..7884a7f7df3 100644
--- a/distrib/landisk/miniroot/Makefile
+++ b/distrib/landisk/miniroot/Makefile
@@ -6,12 +6,6 @@ IMAGE=	miniroot${REV}.fs
 
 MOUNT_POINT=	/mnt
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-PID!=		echo $$$$
-
 DISKTYPE=       miniroot2.5M
 #NBLKS=		8192
 NBLKS=		5120
@@ -31,29 +25,29 @@ ${IMAGE}: rd_setup do_files rd_teardown
 .endif
 
 do_files:
-	installboot -vr ${MOUNT_POINT} ${VND} \
+	installboot -vr ${MOUNT_POINT} `cat vnd` \
 	    ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/usr/mdec/boot
 	gzip -c < ${.OBJDIR}/../ramdisk/bsd.rd > ${MOUNT_POINT}/bsd.rd
 	ln ${MOUNT_POINT}/bsd.rd ${MOUNT_POINT}/bsd
 
 rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
-	vnconfig -v -c -t ${DISKTYPE} ${VND} ${IMAGE}
-	fdisk -i -y ${VND}
-	fdisk -u -y -f ${DESTDIR}/usr/mdec/mbr ${VND}
-	disklabel -w ${VND} ${DISKTYPE}
-	newfs ${NEWFSARGS} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	vnconfig -v -t ${DISKTYPE} ${IMAGE} > vnd
+	fdisk -i -y `cat vnd`
+	fdisk -u -y -f ${DESTDIR}/usr/mdec/mbr `cat vnd`
+	disklabel -w `cat vnd` ${DISKTYPE}
+	newfs ${NEWFSARGS} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
 	@df -i ${MOUNT_POINT}
-	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .PRECIOUS:	${IMAGE}
 
diff --git a/distrib/loongson/miniroot/Makefile b/distrib/loongson/miniroot/Makefile
index f20bb1c234b..cf655941d3e 100644
--- a/distrib/loongson/miniroot/Makefile
+++ b/distrib/loongson/miniroot/Makefile
@@ -6,19 +6,9 @@ IMAGE=	miniroot${REV}.fs
 
 MOUNT_POINT=	/mnt
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_CDEV=	/dev/${VND}c
-VND_IDEV=	/dev/${VND}i
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-VND_RIDEV=	/dev/r${VND}i
-PID!=		echo $$$$
-
 DISKTYPE=       miniroot
 NBLKS=		18432
 
-
 .ifndef DESTDIR
 all ${IMAGE}:
 	@echo setenv DESTDIR before making a ramdisk!
@@ -35,22 +25,21 @@ do_files:
 
 rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
-	vnconfig -v -c -t ${DISKTYPE} ${VND} ${IMAGE}
-	echo 'u\ne 0\n83\n\n63\n*\nw\nq\n' | fdisk -e ${VND} > /dev/null
-	echo 'w\ny\nq\n' | disklabel -E ${VND} > /dev/null
-	newfs_ext2fs ${VND_RIDEV}
-	fsck_ext2fs ${VND_RIDEV}
-	mount ${VND_IDEV} ${MOUNT_POINT}
+	vnconfig -v -t ${DISKTYPE} ${IMAGE} > vnd
+	echo 'u\ne 0\n83\n\n63\n*\nw\nq\n' | fdisk -e `cat vnd` > /dev/null
+	echo 'w\ny\nq\n' | disklabel -E `cat vnd` > /dev/null
+	newfs_ext2fs /dev/r`cat vnd`i
+	mount /dev/`cat vnd`i ${MOUNT_POINT}
 
 rd_teardown:
 	@df -i ${MOUNT_POINT}
 	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .PRECIOUS:	${IMAGE}
 
diff --git a/distrib/luna88k/miniroot/Makefile b/distrib/luna88k/miniroot/Makefile
index 791a8b85cf7..d8fc9db6a17 100644
--- a/distrib/luna88k/miniroot/Makefile
+++ b/distrib/luna88k/miniroot/Makefile
@@ -1,10 +1,11 @@
-#	$OpenBSD: Makefile,v 1.2 2014/03/18 14:35:01 aoyama Exp $
+#	$OpenBSD: Makefile,v 1.3 2019/04/28 14:48:10 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-TARGET=miniroot${REV}.fs
+TARGET=		miniroot${REV}.fs
+MOUNT_POINT=	/mnt
 
 .ifndef DESTDIR
 all ${TARGET}:
@@ -17,28 +18,29 @@ all: ${TARGET}
 ${TARGET}: vn_up install_files showit vn_down
 
 vn_up: blank_filesystem
-	vnconfig vnd0 ${TARGET}
-	disklabel -w vnd0 miniroot
-	newfs -m 0 -f 1024 -b 8192 /dev/rvnd0a
-	mount /dev/vnd0a /mnt
+	vnconfig -v ${TARGET} > vnd
+	disklabel -w `cat vnd` miniroot
+	newfs -m 0 -f 1024 -b 8192 /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 showit:
-	df -ki /mnt
+	df -ki ${MOUNT_POINT}
 
 vn_down:
-	-umount /mnt
-	-vnconfig -u vnd0
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 install_files: bsd.rd boot
 
 bsd.rd:
 	install -c -m 555 -o root -g wheel \
-	    ${.OBJDIR}/../ramdisk/bsd.rd /mnt/bsd
+	    ${.OBJDIR}/../ramdisk/bsd.rd ${MOUNT_POINT}/bsd
 
 boot:
 	install -c -m 555 -o root -g wheel \
-	    ${DESTDIR}/usr/mdec/boot /mnt/boot
-	ln /mnt/boot /mnt/vmunix
+	    ${DESTDIR}/usr/mdec/boot ${MOUNT_POINT}/boot
+	ln ${MOUNT_POINT}/boot ${MOUNT_POINT}/vmunix
 
 blank_filesystem:
 	dd if=/dev/zero of=${TARGET} bs=32k count=128	# 4MB
@@ -46,8 +48,8 @@ blank_filesystem:
 .endif
 
 unconfig:
-	-umount -f /mnt
-	-vnconfig -u /dev/vnd0a
+	-umount -f ${MOUNT_POINT}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .ifdef RELEASEDIR
 install:
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index 0f1ea7f2845..f26ee2a31f4 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.35 2019/04/05 21:08:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.36 2019/04/28 14:48:10 deraadt Exp $
 
 REV=	${OSrev}
 
@@ -62,9 +62,10 @@ ${IMAGE}: ${CBIN}
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/${CBIN}
 	makefs ${MAKEFSARGS_RD} $@ $@.d
-	vnconfig -v -c vnd0 mr.fs
-	df -i /dev/vnd0a
-	vnconfig -u vnd0
+	vnconfig -v mr.fs > vnd
+	df -i /dev/`cat vnd`a
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 .endif
 
diff --git a/distrib/octeon/miniroot/Makefile b/distrib/octeon/miniroot/Makefile
index 17fc9aa2288..d649e7b2aa2 100644
--- a/distrib/octeon/miniroot/Makefile
+++ b/distrib/octeon/miniroot/Makefile
@@ -6,14 +6,6 @@ IMAGE=	miniroot${REV}.fs
 
 MOUNT_POINT=	/mnt
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_IDEV=	/dev/${VND}i
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-VND_RIDEV=	/dev/r${VND}i
-PID!=		echo $$$$
-
 DISKTYPE=       miniroot
 NBLKS=		24576
 NEWFSARGS= -t msdos
@@ -35,22 +27,21 @@ do_files:
 
 rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
-	vnconfig -v -c -t ${DISKTYPE} ${VND} ${IMAGE}
-	echo 'u\ne 0\nC\nn\n64\n22528\nf 0\nw\nq\n' | fdisk -e ${VND}
-	echo 'w\ny\nq\n' | disklabel -E ${VND} > /dev/null
-	newfs ${NEWFSARGS} ${VND_RIDEV}
-	fsck ${VND_RIDEV}
-	mount ${VND_IDEV} ${MOUNT_POINT}
+	vnconfig -v -t ${DISKTYPE} ${IMAGE} > vnd
+	echo 'u\ne 0\nC\nn\n64\n22528\nf 0\nw\nq\n' | fdisk -e `cat vnd`
+	echo 'w\ny\nq\n' | disklabel -E `cat vnd` > /dev/null
+	newfs ${NEWFSARGS} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
 	@df -i ${MOUNT_POINT}
-	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .PRECIOUS:	${IMAGE}
 
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index e8b20646866..4fdb0b92dc2 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.54 2019/04/14 14:07:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.55 2019/04/28 14:48:10 deraadt Exp $
 
 REV=		${OSrev}
 
@@ -12,17 +12,11 @@ ARCHDIR=	${.CURDIR}/../${MACHINE}/ramdisk
 .endif
 
 MOUNT_POINT?=	/mnt
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
 DISKTYPE=	rdroot
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
 IMAGE?=		ramdisk${REV}.fs
 IMAGESIZE?=	8192 # 4MB in 512 byte blocks
 NEWFS_WILL_FAIL?=false
 CRUNCHGENOPTS?=-E
-KERNEL?=	RAMDISK
 UTILS?=		${.CURDIR}/../miniroot
 
 LISTS=		${.CURDIR}/list ${ARCHDIR}/list.local
@@ -55,25 +49,24 @@ all:	bsd.rd
 .endif
 
 ${FLOPPY}:	bsd.gz ${BOOT} ${BOOTXX}
-	dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYSIZE}
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	disklabel -w ${VND} ${FLOPPYTYPE}
-	newfs ${NEWFSOPTS_FD} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	dd if=/dev/zero of=${FLOPPY} count=${FLOPPYSIZE}
+	vnconfig -v ${FLOPPY} > vnd
+	disklabel -w $(cat vnd) ${FLOPPYTYPE}
+	newfs ${NEWFSOPTS_FD} /dev/r$(cat vnd)a
+	mount /dev/$(cat vnd)a ${MOUNT_POINT}
 	cp bsd.gz ${MOUNT_POINT}/bsd
-	${INSTALLBOOT} -v -r ${MOUNT_POINT} ${VND} ${BOOTXX} ${BOOT}
+	${INSTALLBOOT} -v -r ${MOUNT_POINT} $(cat vnd) ${BOOTXX} ${BOOT}
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	dd if=${REALIMAGE} of=${FLOPPY} count=${FLOPPYSIZE}
-	rm -f ${REALIMAGE}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 bsd:
-	cd ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${KERNEL} && \
+	cd ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${RAMDISK} && \
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
-	cp -p ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${KERNEL}/obj/bsd bsd
+	cp -p ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
 
 bsd.rd:	bsd ${IMAGE}
 	cp bsd bsd.rd
@@ -84,11 +77,11 @@ bsd.gz:	bsd.rd
 	gzip ${GZIPFLAGS} < bsd.rd > bsd.gz
 
 ${IMAGE}: ${CBIN}
-	dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE}
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	disklabel -w ${VND} ${DISKTYPE}
-	newfs ${NEWFSOPTS_RD} ${VND_RDEV} || ${NEWFS_WILL_FAIL}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	dd if=/dev/zero of=${IMAGE} count=${IMAGESIZE}
+	vnconfig -v ${IMAGE} > vnd
+	disklabel -w $(cat vnd) ${DISKTYPE}
+	newfs ${NEWFSOPTS_RD} /dev/r$(cat vnd)a || ${NEWFS_WILL_FAIL}
+	mount /dev/$(cat vnd)a ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    ARCHDIR=${ARCHDIR} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
@@ -98,9 +91,7 @@ ${IMAGE}: ${CBIN}
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND_DEV}
-	cp ${REALIMAGE} ${IMAGE}
-	rm ${REALIMAGE}
+	vnconfig -u `cat vnd`
 
 ${CBIN}.conf: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
@@ -129,8 +120,7 @@ beforeinstall:
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-	-/bin/rm -f ${REALIMAGE}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile
index 4955c9707ff..00fde43d08a 100644
--- a/distrib/sgi/cdfs/Makefile
+++ b/distrib/sgi/cdfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2015/09/27 19:11:36 miod Exp $
+#	$OpenBSD: Makefile,v 1.17 2019/04/28 14:48:11 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -22,11 +22,11 @@ SGIVOLSZ=	33500
 ${CDROM}:
 	-rm -rf ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/
-	dd if=/dev/zero of=${.OBJDIR}/${FFS} bs=1m count=${CDFSMB}
-	vnconfig -v -c vnd0 ${.OBJDIR}/${FFS}
-	disklabel -w vnd0 minicdroot "OpenBSD/sgi     "
-	newfs /dev/rvnd0a
-	mount /dev/vnd0a ${.OBJDIR}/cd-dir
+	dd if=/dev/zero of=${FFS} bs=1m count=${CDFSMB}
+	vnconfig -v ${FFS} > vnd
+	disklabel -w `cat vnd` minicdroot "OpenBSD/sgi     "
+	newfs /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSrev}/sgi
 .for IP in ${ALLIP}
 	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP${IP} > \
@@ -39,24 +39,26 @@ ${CDROM}:
 	cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/cd-dir/boot32
 	cp ${DESTDIR}/usr/mdec/boot64 ${.OBJDIR}/cd-dir/boot64
 	umount ${.OBJDIR}/cd-dir
-	@df /dev/vnd0a
-	vnconfig -u vnd0
+	@df /dev/`cat vnd`a
+	vnconfig -u `cat vnd`
+	rm -f vnd
 	dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=`expr ${CDFSMB} + 1 + ${SGIVOLSZ} / 2048`
-	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
-	/usr/mdec/sgivol -i -h ${SGIVOLSZ} vnd0
+	vnconfig -v ${CDROM} > vnd
+	/usr/mdec/sgivol -i -h ${SGIVOLSZ} `cat vnd`
 	uudecode -o ${.OBJDIR}/xfs512.bin.gz ${.CURDIR}/xfs512.bin.gz.uue
 	gzip -d ${.OBJDIR}/xfs512.bin.gz
 	cat ${DESTDIR}/usr/mdec/boot64 >> ${.OBJDIR}/xfs512.bin
 	dd if=${.OBJDIR}/xfs512.bin of=${.OBJDIR}/xfs obs=16m conv=osync
-	/usr/mdec/sgivol -w xfsboot ${.OBJDIR}/xfs vnd0
-	/usr/mdec/sgivol -w bootecoff ${DESTDIR}/usr/mdec/bootecoff vnd0
-	/usr/mdec/sgivol -l bootecoff sash vnd0
-	/usr/mdec/sgivol -w boot32 ${DESTDIR}/usr/mdec/boot32 vnd0
-	/usr/mdec/sgivol -l boot32 sashARCS vnd0
-	/usr/mdec/sgivol -w boot64 ${DESTDIR}/usr/mdec/boot64 vnd0
-	/usr/mdec/sgivol -l boot64 sash64 vnd0
-	vnconfig -u vnd0
-	dd if=${.OBJDIR}/${FFS} of=${.OBJDIR}/${CDROM} bs=512 seek=${SGIVOLSZ}
+	/usr/mdec/sgivol -w xfsboot ${.OBJDIR}/xfs `cat vnd`
+	/usr/mdec/sgivol -w bootecoff ${DESTDIR}/usr/mdec/bootecoff `cat vnd`
+	/usr/mdec/sgivol -l bootecoff sash `cat vnd`
+	/usr/mdec/sgivol -w boot32 ${DESTDIR}/usr/mdec/boot32 `cat vnd`
+	/usr/mdec/sgivol -l boot32 sashARCS `cat vnd`
+	/usr/mdec/sgivol -w boot64 ${DESTDIR}/usr/mdec/boot64 `cat vnd`
+	/usr/mdec/sgivol -l boot64 sash64 `cat vnd`
+	vnconfig -u `cat vnd`
+	rm -f vnd
+	dd if=${FFS} of=${CDROM} bs=512 seek=${SGIVOLSZ}
 
 .ifdef RELEASEDIR
 install:
@@ -64,9 +66,8 @@ install:
 .endif
 
 unconfig:
-	-umount /mnt
-	-umount ${.OBJDIR}/cd-dir
-	-vnconfig -u vnd0
+	-umount -f ${MOUNT_POINT}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 clean cleandir:
 	/bin/rm -f ${CDROM} ${FFS} xfs512.bin xfs
diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile
index 9cc6a35ca3b..135c2e174fd 100644
--- a/distrib/sgi/iso/Makefile
+++ b/distrib/sgi/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.30 2019/03/17 16:32:27 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.31 2019/04/28 14:48:11 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -49,31 +49,32 @@ ${CDROM}:
 
 	# Create the 512 byte sector volume header
 
-	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
+	vnconfig -v ${CDROM} > vnd
 
-	/usr/mdec/sgivol -qi -h `expr ${SGIVOLSZ} \* 4` vnd0
+	/usr/mdec/sgivol -qi -h `expr ${SGIVOLSZ} \* 4` `cat vnd`
 	uudecode -o ${.OBJDIR}/xfs512.bin.gz \
 	    ${.CURDIR}/../cdfs/xfs512.bin.gz.uue
 	gzip -d ${.OBJDIR}/xfs512.bin.gz
 	cat ${DESTDIR}/usr/mdec/boot64 >> ${.OBJDIR}/xfs512.bin
 	dd if=${.OBJDIR}/xfs512.bin of=${.OBJDIR}/xfs obs=16m conv=osync
-	/usr/mdec/sgivol -qw xfsboot ${.OBJDIR}/xfs vnd0
-	/usr/mdec/sgivol -qw bootecof ${DESTDIR}/usr/mdec/bootecoff vnd0
-	/usr/mdec/sgivol -ql bootecof sash vnd0
-	/usr/mdec/sgivol -qw boot32 ${DESTDIR}/usr/mdec/boot32 vnd0
-	/usr/mdec/sgivol -ql boot32 sashARCS vnd0
-	/usr/mdec/sgivol -qw boot64 ${DESTDIR}/usr/mdec/boot64 vnd0
-	/usr/mdec/sgivol -ql boot64 sash64 vnd0
+	/usr/mdec/sgivol -qw xfsboot ${.OBJDIR}/xfs `cat vnd`
+	/usr/mdec/sgivol -qw bootecof ${DESTDIR}/usr/mdec/bootecoff `cat vnd`
+	/usr/mdec/sgivol -ql bootecof sash `cat vnd`
+	/usr/mdec/sgivol -qw boot32 ${DESTDIR}/usr/mdec/boot32 `cat vnd`
+	/usr/mdec/sgivol -ql boot32 sashARCS `cat vnd`
+	/usr/mdec/sgivol -qw boot64 ${DESTDIR}/usr/mdec/boot64 `cat vnd`
+	/usr/mdec/sgivol -ql boot64 sash64 `cat vnd`
 
-	vnconfig -u vnd0
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 	# Create the 2048 byte sector media with the FFS partition
 
-	vnconfig -v -c -t cdroot vnd0 ${.OBJDIR}/${CDROM}
+	vnconfig -v -t cdroot ${CDROM} > vnd
 
-	disklabel -w vnd0 cdroot "OpenBSD/sgi     "
-	newfs /dev/rvnd0a
-	mount /dev/vnd0a ${.OBJDIR}/cd-dir
+	disklabel -w `cat vnd` cdroot "OpenBSD/sgi     "
+	newfs /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
 	cp ${DESTDIR}/usr/mdec/bootecoff ${.OBJDIR}/cd-dir/bootecoff
@@ -102,18 +103,18 @@ ${CDROM}:
 	umount ${.OBJDIR}/cd-dir
 
 	# Summary
-	disklabel vnd0
-	/usr/mdec/sgivol vnd0
+	disklabel `cat vnd`
+	/usr/mdec/sgivol `cat vnd`
 
-	vnconfig -u vnd0
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 install:
 	cp ${CDROM} ${RELDIR}/
 
 unconfig:
-	-umount /mnt
-	-umount ${.OBJDIR}/cd-dir
-	-vnconfig -u vnd0
+	-umount -f ${MOUNT_POINT}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 clean cleandir:
 	/bin/rm -f ${CDROM} xfs512.bin xfs
diff --git a/distrib/socppc/miniroot/Makefile b/distrib/socppc/miniroot/Makefile
index 2d4ce5da8f1..effe24b0382 100644
--- a/distrib/socppc/miniroot/Makefile
+++ b/distrib/socppc/miniroot/Makefile
@@ -6,21 +6,11 @@ IMAGE=	miniroot${REV}.fs
 
 MOUNT_POINT=	/mnt
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_CDEV=	/dev/${VND}c
-VND_IDEV=	/dev/${VND}i
-VND_IRDEV=	/dev/r${VND}i
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-PID!=		echo $$$$
-
 DISKTYPE=       miniroot
 NBLKS=		8064
 # minfree, opt, b/i  trks, sects, cpg
 NEWFSARGS= -m 0 -o space -i 4096
 
-
 .ifndef DESTDIR
 all ${IMAGE}:
 	@echo setenv DESTDIR before making a ramdisk!
@@ -33,28 +23,27 @@ ${IMAGE}: rd_setup do_files rd_teardown
 .endif
 
 do_files:
-	dd if=${DESTDIR}/usr/mdec/boot.elf of=${VND_IRDEV} conv=osync
+	dd if=${DESTDIR}/usr/mdec/boot.elf of=/dev/r`cat vnd`i conv=osync
 	gzip -c < ${.OBJDIR}/../ramdisk/bsd.rd > ${MOUNT_POINT}/bsd.rd
 	ln ${MOUNT_POINT}/bsd.rd ${MOUNT_POINT}/bsd
 
 rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
-	vnconfig -v -c -t ${DISKTYPE} ${VND} ${IMAGE}
-	fdisk -i -y ${VND}
-	disklabel -w ${VND} ${DISKTYPE}
-	newfs ${NEWFSARGS} ${VND_RDEV}
-	fsck ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	vnconfig -v -t ${DISKTYPE} ${IMAGE} > vnd
+	fdisk -i -y `cat vnd`
+	disklabel -w `cat vnd` ${DISKTYPE}
+	newfs ${NEWFSARGS} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
 	@df -i ${MOUNT_POINT}
-	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .PRECIOUS:	${IMAGE}
 
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index bbd338bc0da..71ef035d764 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.37 2019/04/14 14:07:08 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.38 2019/04/28 14:48:11 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -12,8 +12,6 @@ STRIPOPTS?=	-R .SUNW_ctf
 GZIPFLAGS?=	-9fn
 MTREE=		${UTILS}/mtree.conf
 
-RAMDISK=	RAMDISK
-
 all: bsd.rd
 
 DISKTYPE=	rdroot
@@ -29,9 +27,9 @@ bsd.rd_unz: bsd ${IMAGE}
 	rdsetroot bsd.rd_unz ${IMAGE}
 
 bsd:
-	cd ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK} && \
+	cd ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISK && \
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
-	cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK}/obj/bsd bsd
+	cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISK/obj/bsd bsd
 
 ${IMAGE}: ${CBIN}
 	rm -rf $@.d
diff --git a/distrib/sparc64/cdfs/Makefile b/distrib/sparc64/cdfs/Makefile
index d14437cca6a..bd73065555c 100644
--- a/distrib/sparc64/cdfs/Makefile
+++ b/distrib/sparc64/cdfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2011/06/08 19:16:19 krw Exp $
+#	$OpenBSD: Makefile,v 1.17 2019/04/28 14:48:11 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -28,10 +28,11 @@ ${CDROM}:
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
 	    -V "OpenBSD/sparc64 ${OSREV} boot-only CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
-	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
-	disklabel -w vnd0 fakecdrom "OpenBSD${REV}sparc64"
-	vnconfig -u vnd0
-	mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs
+	vnconfig -v ${CDROM} > vnd
+	disklabel -w `cat vnd` fakecdrom "OpenBSD${REV}sparc64"
+	vnconfig -u `cat vnd`
+	rm -f vnd
+	mksuncd f ${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs
 
 .ifdef RELEASEDIR
 install:
diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc
index 2daadf3527d..df8eda300b0 100644
--- a/distrib/sparc64/common/Makefile.inc
+++ b/distrib/sparc64/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.18 2019/04/05 21:08:01 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.19 2019/04/28 14:48:11 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -14,12 +14,6 @@ MTREE=		${UTILS}/mtree.conf
 
 XNAME?=		floppy
 FS?=		${XNAME}${REV}.fs
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
 LISTFLOPPY?=	${.CURDIR}/../common/list_floppy
 FLOPPYSIZE?=	144
 FLOPPYSECS?=	18
@@ -28,22 +22,21 @@ FLOPPYTYPE?=	floppy3
 all:	${FS}
 
 ${FS}:	bsd.rd
-	dd if=/dev/zero of=${REALIMAGE} bs=10k count=${FLOPPYSIZE}
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	disklabel -w ${VND} ${FLOPPYTYPE}
-	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	dd if=/dev/zero of=${FS} bs=10k count=${FLOPPYSIZE}
+	vnconfig -v ${FS} > vnd
+	disklabel -w `cat vnd` ${FLOPPYTYPE}
+	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
 	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTFLOPPY}
-	installboot -v ${VND}
+	installboot -v `cat vnd`
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	cp ${REALIMAGE} ${FS}
-	rm ${REALIMAGE}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 DISKTYPE?=       rdroot
 NBLKS?=          3510
@@ -53,24 +46,20 @@ NEWFSARGS= -m 0 -o space -i 4096
 ${IMAGE}: ${CBIN} rd_setup do_files rd_teardown
 
 rd_setup: ${CBIN}
-	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${NBLKS}
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	disklabel -w ${VND} ${DISKTYPE}
-	newfs ${NEWFSARGS} ${VND_RDEV}
-	fsck ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
+	vnconfig -v ${IMAGE} > vnd
+	disklabel -w `cat vnd` ${DISKTYPE}
+	newfs ${NEWFSARGS} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 rd_teardown:
 	@df -i ${MOUNT_POINT}
 	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-	cp ${REALIMAGE} ${IMAGE}
-	rm ${REALIMAGE}
+	-vnconfig -u `cat vnd`
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-	-/bin/rm -f ${IMAGE}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .PRECIOUS:	${IMAGE}
 
diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile
index 6415bbaff86..59b5e174f94 100644
--- a/distrib/sparc64/iso/Makefile
+++ b/distrib/sparc64/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2014/09/21 13:44:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.17 2019/04/28 14:48:11 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -43,9 +43,10 @@ ${CDROM}: ${BASE} ${XBASE}
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
 	    -V "OpenBSD/${MACHINE} ${OSREV} Install CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
-	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
-	disklabel -w vnd0 fakecdrom "OpenBSD${REV}${MACHINE}"
-	vnconfig -u vnd0
+	vnconfig -v ${.OBJDIR}/${CDROM} > vnd
+	disklabel -w `cat vnd` fakecdrom "OpenBSD${REV}${MACHINE}"
+	vnconfig -u `cat vnd`
+	rm -f vnd
 	mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs
 
 install:
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index 7ef4367a75c..fc5cf60ba14 100644
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,10 +1,11 @@
-#	$OpenBSD: Makefile,v 1.8 2015/03/12 21:41:56 naddy Exp $
+#	$OpenBSD: Makefile,v 1.9 2019/04/28 14:48:11 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-TARGET=miniroot${REV}.fs
+TARGET=		miniroot${REV}.fs
+MOUNT_POINT=	/mnt
 
 .ifndef DESTDIR
 all ${TARGET}:
@@ -17,30 +18,31 @@ all: ${TARGET}
 ${TARGET}: vn_up install_files installboot showit vn_down
 
 vn_up: blank_filesystem
-	vnconfig vnd0 ${TARGET}
-	disklabel -w vnd0 fakeramdisk
-	newfs -m 0 /dev/rvnd0a
-	mount /dev/vnd0a /mnt
+	vnconfig -v ${TARGET} > vnd
+	disklabel -w `cat vnd` fakeramdisk
+	newfs -m 0 /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 
 showit:
-	df -ki /mnt
+	df -ki ${MOUNT_POINT}
 
 vn_down:
-	-umount /mnt
-	-vnconfig -u vnd0
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 install_files: bsd.rd ofwboot
 
 bsd.rd:
 	install -c -m 555 -o root -g wheel \
-	    ${.OBJDIR}/../bsd.rd/bsd.rd /mnt/bsd
+	    ${.OBJDIR}/../bsd.rd/bsd.rd ${MOUNT_POINT}/bsd
 
 ofwboot:
 	install -c -m 555 -o root -g wheel \
-	    ${DESTDIR}/usr/mdec/ofwbootfd /mnt/ofwboot
+	    ${DESTDIR}/usr/mdec/ofwbootfd ${MOUNT_POINT}/ofwboot
 
 installboot:
-	installboot -v vnd0
+	installboot -v `cat vnd`
 
 blank_filesystem:
 	dd if=/dev/zero of=${TARGET} bs=512 count=5760
@@ -48,8 +50,8 @@ blank_filesystem:
 .endif
 
 unconfig:
-	-umount -f /mnt
-	-vnconfig -u /dev/vnd0a
+	-umount -f ${MOUNT_POINT}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 .ifdef RELEASEDIR
 install:
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 054f3cdc882..6943e44da99 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.38 2019/04/14 14:07:08 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.39 2019/04/28 14:48:11 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -16,16 +16,8 @@ FLOPPY=		floppy${REV}.fs
 FLOPPYSIZE?=	2880
 FLOPPYTYPE?=	floppy
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-
 GZIPFLAGS?=	-9nv
 
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
-KERNEL?=	RAMDISKU1
-
 DISKTYPE=	rdroot
 MAKEFSARGS_RD=	-o disklabel=${DISKTYPE},minfree=0,density=4096
 
@@ -42,21 +34,20 @@ bsd.gz:	bsd.rd
 	gzip ${GZIPFLAGS} < bsd.rd > bsd.gz
 
 ${FLOPPY}:	bsd.gz ${BOOT} /usr/
-	dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYSIZE}
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	disklabel -w ${VND} ${FLOPPYTYPE}
-	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	dd if=/dev/zero of=${FLOPPY} count=${FLOPPYSIZE}
+	vnconfig -v ${FLOPPY} > vnd
+	disklabel -w `cat vnd` ${FLOPPYTYPE}
+	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 	cp ${DESTDIR}/usr/mdec/ofwbootfd ${MOUNT_POINT}/ofwboot
 	cp bsd.gz ${MOUNT_POINT}/bsd
-	installboot -v ${VND} /usr/mdec/bootblk ${MOUNT_POINT}/ofwboot
+	installboot -v `cat vnd` /usr/mdec/bootblk ${MOUNT_POINT}/ofwboot
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	dd if=${REALIMAGE} of=${FLOPPY} count=${FLOPPYSIZE}
-	rm -f ${REALIMAGE}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 ${BSD_RD}: ${CBIN} ${IMAGE} bsd
 	cp bsd ${BSD_RD}
@@ -76,13 +67,13 @@ ${IMAGE}: ${CBIN}
 .endif
 
 bsd:
-	cd ${TOP}/../../sys/arch/sparc64/compile/${KERNEL} && \
+	cd ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU1 && \
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env ${MAKE}'
-	cp -p ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/obj/bsd bsd
+	cp -p ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU1/obj/bsd bsd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 ${CBIN}.conf: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index b6efc0a0a6a..f287ec53016 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.32 2019/04/14 14:07:08 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.33 2019/04/28 14:48:11 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -16,16 +16,8 @@ FLOPPY=		floppyB${REV}.fs
 FLOPPYSIZE?=	2880
 FLOPPYTYPE?=	floppy
 
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-
 GZIPFLAGS?=	-9nv
 
-PID!=		echo $$$$
-REALIMAGE!=	echo /var/tmp/image.${PID}
-KERNEL?=	RAMDISKU5
-
 DISKTYPE=	rdroot
 MAKEFSARGS_RD=	-o disklabel=${DISKTYPE},minfree=0,density=8192
 
@@ -42,21 +34,20 @@ bsd.gz:	bsd.rd
 	gzip ${GZIPFLAGS} < bsd.rd > bsd.gz
 
 ${FLOPPY}:	bsd.gz ${BOOT} /usr/
-	dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYSIZE}
-	vnconfig -v -c ${VND} ${REALIMAGE}
-	disklabel -w ${VND} ${FLOPPYTYPE}
-	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
+	dd if=/dev/zero of=${FLOPPY} count=${FLOPPYSIZE}
+	vnconfig -v ${FLOPPY} > vnd
+	disklabel -w `cat vnd` ${FLOPPYTYPE}
+	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} /dev/r`cat vnd`a
+	mount /dev/`cat vnd`a ${MOUNT_POINT}
 	cp ${DESTDIR}/usr/mdec/ofwbootfd ${MOUNT_POINT}/ofwboot
 	cp bsd.gz ${MOUNT_POINT}/bsd
-	installboot -v ${VND} /usr/mdec/bootblk ${MOUNT_POINT}/ofwboot
+	installboot -v `cat vnd` /usr/mdec/bootblk ${MOUNT_POINT}/ofwboot
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	dd if=${REALIMAGE} of=${FLOPPY} count=${FLOPPYSIZE}
-	rm -f ${REALIMAGE}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
 ${BSD_RD}: ${CBIN} ${IMAGE} bsd
 	cp bsd ${BSD_RD}
@@ -76,13 +67,13 @@ ${IMAGE}: ${CBIN}
 .endif
 
 bsd:
-	cd ${TOP}/../../sys/arch/sparc64/compile/${KERNEL} && \
+	cd ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU5 && \
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
-	cp -p ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/obj/bsd bsd
+	cp -p ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU5/obj/bsd bsd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
 
 ${CBIN}.conf: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf