Deprecate vnds in favour of svnds.

In effect, this removes the "old" vndX nodes, and renames
the svndX nodes to vndX.

Old svndX nodes will still continue to work though, for now.

Cleanup accordingly.

ok deraadt@, todd@
comments and ok on the man page bits from jmc@

3 files changed, 29 insertions, 29 deletions

diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile
index 70d37e2c127..f1c64750fbc 100644
--- a/distrib/sgi/cdfs/Makefile
+++ b/distrib/sgi/cdfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2010/03/31 19:44:33 miod Exp $
+#	$OpenBSD: Makefile,v 1.11 2011/04/18 16:52:10 thib Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -15,10 +15,10 @@ ${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 svnd0 ${.OBJDIR}/${FFS}
-	disklabel -w svnd0 minicdroot "OpenBSD/sgi     "
-	newfs /dev/rsvnd0a
-	mount /dev/svnd0a ${.OBJDIR}/cd-dir
+	vnconfig -v -c vnd0 ${.OBJDIR}/${FFS}
+	disklabel -w vnd0 minicdroot "OpenBSD/sgi     "
+	newfs /dev/rvnd0a
+	mount /dev/vnd0a ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSrev}/sgi
 	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP27 > \
 	    ${.OBJDIR}/cd-dir/bsd.IP27
@@ -38,17 +38,17 @@ ${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/svnd0a
-	vnconfig -u svnd0
+	@df /dev/vnd0a
+	vnconfig -u vnd0
 	dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=`expr ${CDFSMB} + 2`
-	vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM}
+	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
 	# boot32 needs 77, boot64 needs 173, and add some room for growth
-	/usr/mdec/sgivol -i -h 320 svnd0 > ${.OBJDIR}/volhdr
-	/usr/mdec/sgivol -w boot32 ${DESTDIR}/usr/mdec/boot32 svnd0
-	/usr/mdec/sgivol -l boot32 sashARCS svnd0
-	/usr/mdec/sgivol -w boot64 ${DESTDIR}/usr/mdec/boot64 svnd0
-	/usr/mdec/sgivol -l boot64 sash64 svnd0
-	vnconfig -u svnd0
+	/usr/mdec/sgivol -i -h 320 vnd0 > ${.OBJDIR}/volhdr
+	/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=`cat ${.OBJDIR}/volhdr | grep 'Volume Header' | awk '{print $$3}'`
 
@@ -60,7 +60,7 @@ install:
 unconfig:
 	-umount /mnt
 	-umount ${.OBJDIR}/cd-dir
-	-vnconfig -u svnd0
+	-vnconfig -u vnd0
 
 clean cleandir:
 	/bin/rm -f ${CDROM} ${FFS} volhdr
diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile
index 7d5919d85e1..38e453c4277 100644
--- a/distrib/sgi/iso/Makefile
+++ b/distrib/sgi/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2010/10/18 05:40:47 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.17 2011/04/18 16:52:10 thib Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -31,17 +31,17 @@ ${CDROM}:
 	mkdir -p ${.OBJDIR}/cd-dir/
 
 	dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=2048b count=280
-	vnconfig -v -c -t cdroot svnd0 ${.OBJDIR}/${CDROM}
+	vnconfig -v -c -t cdroot vnd0 ${.OBJDIR}/${CDROM}
 
-	/usr/mdec/sgivol -i -h 80 svnd0
-	/usr/mdec/sgivol -w boot32 ${DESTDIR}/usr/mdec/boot32 svnd0
-	/usr/mdec/sgivol -l boot32 sashARCS svnd0
-	/usr/mdec/sgivol -w boot64 ${DESTDIR}/usr/mdec/boot64 svnd0
-	/usr/mdec/sgivol -l boot64 sash64 svnd0
+	/usr/mdec/sgivol -i -h 80 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
 
-	disklabel -w svnd0 cdroot "OpenBSD/sgi     "
-	newfs /dev/rsvnd0a
-	mount /dev/svnd0a ${.OBJDIR}/cd-dir
+	disklabel -w vnd0 cdroot "OpenBSD/sgi     "
+	newfs /dev/rvnd0a
+	mount /dev/vnd0a ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
 	cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/cd-dir/boot32
@@ -62,7 +62,7 @@ ${CDROM}:
 	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
 	umount ${.OBJDIR}/cd-dir
-	vnconfig -u svnd0
+	vnconfig -u vnd0
 
 install:
 	cp ${CDROM} ${RELDIR}/
@@ -75,7 +75,7 @@ install:
 unconfig:
 	-umount /mnt
 	-umount ${.OBJDIR}/cd-dir
-	-vnconfig -u svnd0
+	-vnconfig -u vnd0
 
 clean cleandir:
 	/bin/rm -f ${CDROM}
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile
index 541b742b9ae..477f2a141a2 100644
--- a/distrib/sgi/ramdisk/Makefile
+++ b/distrib/sgi/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2011/04/15 03:11:22 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.14 2011/04/18 16:52:10 thib Exp $
 
 REV=		${OSrev}
 
@@ -15,7 +15,7 @@ UTILS?=		${.CURDIR}/../../miniroot
 MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
-VND?=		svnd0
+VND?=		vnd0
 VND_DEV=	/dev/${VND}a
 VND_RDEV=	/dev/r${VND}a
 VND_CRDEV=	/dev/r${VND}c