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.

1 files changed, 15 insertions, 24 deletions

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}