From 53ad0f2a2ff5d85bcc99452d351aef2f350e9ff7 Mon Sep 17 00:00:00 2001
From: thib <>
Date: Mon, 18 Apr 2011 16:52:11 +0000
Subject: [PATCH] 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@
---
 src/etc/MAKEDEV.common         |  5 +--
 src/etc/MAKEDEV.mi             |  4 +-
 src/etc/etc.alpha/MAKEDEV      |  1 -
 src/etc/etc.amd64/MAKEDEV      |  1 -
 src/etc/etc.armish/MAKEDEV     |  1 -
 src/etc/etc.aviion/MAKEDEV     |  1 -
 src/etc/etc.hp300/MAKEDEV      |  1 -
 src/etc/etc.hppa/MAKEDEV       |  1 -
 src/etc/etc.hppa64/MAKEDEV     |  1 -
 src/etc/etc.i386/INSTALL.linux |  4 +-
 src/etc/etc.i386/MAKEDEV       |  1 -
 src/etc/etc.landisk/MAKEDEV    |  1 -
 src/etc/etc.loongson/MAKEDEV   |  1 -
 src/etc/etc.luna88k/MAKEDEV    |  1 -
 src/etc/etc.mac68k/MAKEDEV     |  1 -
 src/etc/etc.macppc/MAKEDEV     |  1 -
 src/etc/etc.mvme68k/MAKEDEV    |  1 -
 src/etc/etc.mvme88k/MAKEDEV    |  1 -
 src/etc/etc.mvmeppc/MAKEDEV    | 80 ++++++++++++++++------------------
 src/etc/etc.mvmeppc/MAKEDEV.md | 80 ++++++++++++++++------------------
 src/etc/etc.palm/MAKEDEV       |  1 -
 src/etc/etc.sgi/MAKEDEV        |  1 -
 src/etc/etc.socppc/MAKEDEV     |  1 -
 src/etc/etc.sparc/MAKEDEV      |  1 -
 src/etc/etc.sparc64/MAKEDEV    |  1 -
 src/etc/etc.vax/MAKEDEV        |  1 -
 src/etc/etc.zaurus/MAKEDEV     |  1 -
 27 files changed, 80 insertions(+), 115 deletions(-)

diff --git a/src/etc/MAKEDEV.common b/src/etc/MAKEDEV.common
index 34c73967..71d3061a 100644
--- a/src/etc/MAKEDEV.common
+++ b/src/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp $-})dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -283,8 +283,7 @@ __devitem(wd, {-wd*-}, {-quote(winchester)disk drives (ST506{-,-} IDE{-,-} ESDI{
 __devitem(ccd, ccd*, Concatenated disk devices)dnl
 __devitem(raid, raid*, RAIDframe disk devices)dnl
 __devitem(vnd, vnd*, quote(file)pseudo-disk devices)dnl
-_mkdev(vnd, vnd*, {-dodisk vnd $U major_vnd_b major_vnd_c $U 0{--}ifstep(vnd)
-	dodisk svnd $U major_vnd_b major_vnd_c $U 2048{--}ifstep(vnd)-})dnl
+_mkdev(vnd, vnd*, {-dodisk vnd $U major_vnd_b major_vnd_c $U 0{--}ifstep(vnd)-})dnl
 __devitem(ra, ra*, {-MSCP disks-})dnl
 __devitem(hp, hp*, {-MASSBUS disks-})dnl
 __devitem(hk, hk*, {-UNIBUS RK06 and RK07 disks-})dnl
diff --git a/src/etc/MAKEDEV.mi b/src/etc/MAKEDEV.mi
index c52a32c9..f83e05e5 100644
--- a/src/etc/MAKEDEV.mi
+++ b/src/etc/MAKEDEV.mi
@@ -1,7 +1,7 @@
 define(COMM,`#')dnl
 include(MAKEDEV.sub)dnl
 dnl
-vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp $-})dnl
 dnl
 divert(1)dnl
 {-#-}
@@ -152,7 +152,7 @@ dnl 2. unit    - beginning unit number for block devices
 dnl 3. blkmaj  - block device major number
 dnl 4. chrmaj  - character device major number
 dnl 5. unit    - beginning unit number for character devices
-dnl 6. off     - offset from 0 for all minor numbers (see svnd for an example)
+dnl 6. off     - offset from 0 for all minor numbers
 dnl 7. step    - optional, defaults to 16, number of partitions per device
 dnl
 
diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 66cfffe8..db33de1a 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -511,7 +511,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 9 9 $U 0
-	dodisk svnd $U 9 9 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index 074f03a9..e96e1e95 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/etc/etc.amd64/MAKEDEV
@@ -542,7 +542,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 14 41 $U 0
-	dodisk svnd $U 14 41 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV
index 3c69f6e9..63f7df6c 100644
--- a/src/etc/etc.armish/MAKEDEV
+++ b/src/etc/etc.armish/MAKEDEV
@@ -482,7 +482,6 @@ st*)
 
 vnd*)
 	dodisk vnd $U 19 19 $U 0
-	dodisk svnd $U 19 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.aviion/MAKEDEV b/src/etc/etc.aviion/MAKEDEV
index 03336127..80a0a533 100644
--- a/src/etc/etc.aviion/MAKEDEV
+++ b/src/etc/etc.aviion/MAKEDEV
@@ -320,7 +320,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 8 19 $U 0
-	dodisk svnd $U 8 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 96b5d3b5..952650e0 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -446,7 +446,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 6 19 $U 0
-	dodisk svnd $U 6 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 336c2f39..64d2bebc 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -459,7 +459,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 2 8 $U 0
-	dodisk svnd $U 2 8 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV
index d5bf84e9..b217574b 100644
--- a/src/etc/etc.hppa64/MAKEDEV
+++ b/src/etc/etc.hppa64/MAKEDEV
@@ -449,7 +449,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 2 8 $U 0
-	dodisk svnd $U 2 8 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.i386/INSTALL.linux b/src/etc/etc.i386/INSTALL.linux
index 85cbfcf3..bded13bd 100644
--- a/src/etc/etc.i386/INSTALL.linux
+++ b/src/etc/etc.i386/INSTALL.linux
@@ -1,4 +1,4 @@
-$OpenBSD: INSTALL.linux,v 1.15 2010/02/22 10:44:07 giovanni Exp $
+$OpenBSD: INSTALL.linux,v 1.16 2011/04/18 16:52:10 thib Exp $
 
    Linux + OpenBSD: it's possible
 
@@ -55,7 +55,7 @@ contents are unimportant (or whose backups are always up-to-date) next to
 the frontier between OpenBSD and Linux. For instance, it's usually a good
 idea to locate the swap area such that you can grow or shrink it. Keep in
 mind that exceptional usage (very large, temporary swaps) can use a
-temporary file instead of a partition, under both OpenBSD (svnd) and Linux.
+temporary file instead of a partition, under both OpenBSD (vnd) and Linux.
 
 First principles
 ----------------
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 0374eb4a..4e70e75a 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -553,7 +553,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 14 41 $U 0
-	dodisk svnd $U 14 41 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index 941aa338..d9ea517e 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -458,7 +458,6 @@ st*)
 
 vnd*)
 	dodisk vnd $U 19 19 $U 0
-	dodisk svnd $U 19 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV
index 397dc506..db7e47bc 100644
--- a/src/etc/etc.loongson/MAKEDEV
+++ b/src/etc/etc.loongson/MAKEDEV
@@ -442,7 +442,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 2 11 $U 0
-	dodisk svnd $U 2 11 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV
index a8f0d0a4..440314b0 100644
--- a/src/etc/etc.luna88k/MAKEDEV
+++ b/src/etc/etc.luna88k/MAKEDEV
@@ -354,7 +354,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 8 19 $U 0
-	dodisk svnd $U 8 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 4cc5bf3c..c271c018 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -374,7 +374,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 8 19 $U 0
-	dodisk svnd $U 8 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index 25a7e78f..a1b5a65e 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -499,7 +499,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 14 19 $U 0
-	dodisk svnd $U 14 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index 20337a9b..dd7aa230 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -403,7 +403,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 6 19 $U 0
-	dodisk svnd $U 6 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV
index 59670b5d..de7277be 100644
--- a/src/etc/etc.mvme88k/MAKEDEV
+++ b/src/etc/etc.mvme88k/MAKEDEV
@@ -358,7 +358,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 8 19 $U 0
-	dodisk svnd $U 8 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.mvmeppc/MAKEDEV b/src/etc/etc.mvmeppc/MAKEDEV
index 2a4bff6a..2e8fd634 100644
--- a/src/etc/etc.mvmeppc/MAKEDEV
+++ b/src/etc/etc.mvmeppc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.13 2009/06/03 14:45:40 jj Exp $
+#	$OpenBSD: MAKEDEV,v 1.14 2011/04/18 16:52:11 thib Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -268,48 +268,42 @@ sd*|wd*|ccd*|ofdisk*|raid*)
 
 vnd*)
 	umask 2 ; unit=${i##*[a-z]}
-	for name in vnd svnd; do
-		blk=14; chr=19;
-		case $name in
-		vnd)	off=0;;
-		svnd)	off=2048;;
-		esac
-		rm -f $name$unit? r$name$unit?
-		mknod ${name}${unit}a	b $blk $(( $unit * 16 + $off + 0 ))
-		mknod ${name}${unit}b	b $blk $(( $unit * 16 + $off + 1 ))
-		mknod ${name}${unit}c	b $blk $(( $unit * 16 + $off + 2 ))
-		mknod ${name}${unit}d	b $blk $(( $unit * 16 + $off + 3 ))
-		mknod ${name}${unit}e	b $blk $(( $unit * 16 + $off + 4 ))
-		mknod ${name}${unit}f	b $blk $(( $unit * 16 + $off + 5 ))
-		mknod ${name}${unit}g	b $blk $(( $unit * 16 + $off + 6 ))
-		mknod ${name}${unit}h	b $blk $(( $unit * 16 + $off + 7 ))
-		mknod ${name}${unit}i	b $blk $(( $unit * 16 + $off + 8 ))
-		mknod ${name}${unit}j	b $blk $(( $unit * 16 + $off + 9 ))
-		mknod ${name}${unit}k	b $blk $(( $unit * 16 + $off + 10 ))
-		mknod ${name}${unit}l	b $blk $(( $unit * 16 + $off + 11 ))
-		mknod ${name}${unit}m	b $blk $(( $unit * 16 + $off + 12 ))
-		mknod ${name}${unit}n	b $blk $(( $unit * 16 + $off + 13 ))
-		mknod ${name}${unit}o	b $blk $(( $unit * 16 + $off + 14 ))
-		mknod ${name}${unit}p	b $blk $(( $unit * 16 + $off + 15 ))
-		mknod r${name}${unit}a	c $chr $(( $unit * 16 + $off + 0 ))
-		mknod r${name}${unit}b	c $chr $(( $unit * 16 + $off + 1 ))
-		mknod r${name}${unit}c	c $chr $(( $unit * 16 + $off + 2 ))
-		mknod r${name}${unit}d	c $chr $(( $unit * 16 + $off + 3 ))
-		mknod r${name}${unit}e	c $chr $(( $unit * 16 + $off + 4 ))
-		mknod r${name}${unit}f	c $chr $(( $unit * 16 + $off + 5 ))
-		mknod r${name}${unit}g	c $chr $(( $unit * 16 + $off + 6 ))
-		mknod r${name}${unit}h	c $chr $(( $unit * 16 + $off + 7 ))
-		mknod r${name}${unit}i	c $chr $(( $unit * 16 + $off + 8 ))
-		mknod r${name}${unit}j	c $chr $(( $unit * 16 + $off + 9 ))
-		mknod r${name}${unit}k	c $chr $(( $unit * 16 + $off + 10 ))
-		mknod r${name}${unit}l	c $chr $(( $unit * 16 + $off + 11 ))
-		mknod r${name}${unit}m	c $chr $(( $unit * 16 + $off + 12 ))
-		mknod r${name}${unit}n	c $chr $(( $unit * 16 + $off + 13 ))
-		mknod r${name}${unit}o	c $chr $(( $unit * 16 + $off + 14 ))
-		mknod r${name}${unit}p	c $chr $(( $unit * 16 + $off + 15 ))
-		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-	done
+	blk=14; chr=19;
+	rm -f $name$unit? r$name$unit?
+	mknod ${name}${unit}a	b $blk $(( $unit * 16 + 0 ))
+	mknod ${name}${unit}b	b $blk $(( $unit * 16 + 1 ))
+	mknod ${name}${unit}c	b $blk $(( $unit * 16 + 2 ))
+	mknod ${name}${unit}d	b $blk $(( $unit * 16 + 3 ))
+	mknod ${name}${unit}e	b $blk $(( $unit * 16 + 4 ))
+	mknod ${name}${unit}f	b $blk $(( $unit * 16 + 5 ))
+	mknod ${name}${unit}g	b $blk $(( $unit * 16 + 6 ))
+	mknod ${name}${unit}h	b $blk $(( $unit * 16 + 7 ))
+	mknod ${name}${unit}i	b $blk $(( $unit * 16 + 8 ))
+	mknod ${name}${unit}j	b $blk $(( $unit * 16 + 9 ))
+	mknod ${name}${unit}k	b $blk $(( $unit * 16 + 10 ))
+	mknod ${name}${unit}l	b $blk $(( $unit * 16 + 11 ))
+	mknod ${name}${unit}m	b $blk $(( $unit * 16 + 12 ))
+	mknod ${name}${unit}n	b $blk $(( $unit * 16 + 13 ))
+	mknod ${name}${unit}o	b $blk $(( $unit * 16 + 14 ))
+	mknod ${name}${unit}p	b $blk $(( $unit * 16 + 15 ))
+	mknod r${name}${unit}a	c $chr $(( $unit * 16 + 0 ))
+	mknod r${name}${unit}b	c $chr $(( $unit * 16 + 1 ))
+	mknod r${name}${unit}c	c $chr $(( $unit * 16 + 2 ))
+	mknod r${name}${unit}d	c $chr $(( $unit * 16 + 3 ))
+	mknod r${name}${unit}e	c $chr $(( $unit * 16 + 4 ))
+	mknod r${name}${unit}f	c $chr $(( $unit * 16 + 5 ))
+	mknod r${name}${unit}g	c $chr $(( $unit * 16 + 6 ))
+	mknod r${name}${unit}h	c $chr $(( $unit * 16 + 7 ))
+	mknod r${name}${unit}i	c $chr $(( $unit * 16 + 8 ))
+	mknod r${name}${unit}j	c $chr $(( $unit * 16 + 9 ))
+	mknod r${name}${unit}k	c $chr $(( $unit * 16 + 10 ))
+	mknod r${name}${unit}l	c $chr $(( $unit * 16 + 11 ))
+	mknod r${name}${unit}m	c $chr $(( $unit * 16 + 12 ))
+	mknod r${name}${unit}n	c $chr $(( $unit * 16 + 13 ))
+	mknod r${name}${unit}o	c $chr $(( $unit * 16 + 14 ))
+	mknod r${name}${unit}p	c $chr $(( $unit * 16 + 15 ))
+	chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
+	chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 	umask 77
 	;;
 
diff --git a/src/etc/etc.mvmeppc/MAKEDEV.md b/src/etc/etc.mvmeppc/MAKEDEV.md
index 2a687b39..67bad085 100644
--- a/src/etc/etc.mvmeppc/MAKEDEV.md
+++ b/src/etc/etc.mvmeppc/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,macppc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.34 2010/09/30 15:27:54 claudio Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.35 2011/04/18 16:52:11 thib Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -118,48 +118,42 @@ sd*|wd*|ccd*|ofdisk*|raid*)
 
 vnd*)
 	umask 2 ; unit=${i##*[a-z]}
-	for name in vnd svnd; do
-		blk=14; chr=19;
-		case $name in
-		vnd)	off=0;;
-		svnd)	off=128;;
-		esac
-		rm -f $name$unit? r$name$unit?
-		mknod ${name}${unit}a	b $blk $(( $unit * 16 + $off + 0 ))
-		mknod ${name}${unit}b	b $blk $(( $unit * 16 + $off + 1 ))
-		mknod ${name}${unit}c	b $blk $(( $unit * 16 + $off + 2 ))
-		mknod ${name}${unit}d	b $blk $(( $unit * 16 + $off + 3 ))
-		mknod ${name}${unit}e	b $blk $(( $unit * 16 + $off + 4 ))
-		mknod ${name}${unit}f	b $blk $(( $unit * 16 + $off + 5 ))
-		mknod ${name}${unit}g	b $blk $(( $unit * 16 + $off + 6 ))
-		mknod ${name}${unit}h	b $blk $(( $unit * 16 + $off + 7 ))
-		mknod ${name}${unit}i	b $blk $(( $unit * 16 + $off + 8 ))
-		mknod ${name}${unit}j	b $blk $(( $unit * 16 + $off + 9 ))
-		mknod ${name}${unit}k	b $blk $(( $unit * 16 + $off + 10 ))
-		mknod ${name}${unit}l	b $blk $(( $unit * 16 + $off + 11 ))
-		mknod ${name}${unit}m	b $blk $(( $unit * 16 + $off + 12 ))
-		mknod ${name}${unit}n	b $blk $(( $unit * 16 + $off + 13 ))
-		mknod ${name}${unit}o	b $blk $(( $unit * 16 + $off + 14 ))
-		mknod ${name}${unit}p	b $blk $(( $unit * 16 + $off + 15 ))
-		mknod r${name}${unit}a	c $chr $(( $unit * 16 + $off + 0 ))
-		mknod r${name}${unit}b	c $chr $(( $unit * 16 + $off + 1 ))
-		mknod r${name}${unit}c	c $chr $(( $unit * 16 + $off + 2 ))
-		mknod r${name}${unit}d	c $chr $(( $unit * 16 + $off + 3 ))
-		mknod r${name}${unit}e	c $chr $(( $unit * 16 + $off + 4 ))
-		mknod r${name}${unit}f	c $chr $(( $unit * 16 + $off + 5 ))
-		mknod r${name}${unit}g	c $chr $(( $unit * 16 + $off + 6 ))
-		mknod r${name}${unit}h	c $chr $(( $unit * 16 + $off + 7 ))
-		mknod r${name}${unit}i	c $chr $(( $unit * 16 + $off + 8 ))
-		mknod r${name}${unit}j	c $chr $(( $unit * 16 + $off + 9 ))
-		mknod r${name}${unit}k	c $chr $(( $unit * 16 + $off + 10 ))
-		mknod r${name}${unit}l	c $chr $(( $unit * 16 + $off + 11 ))
-		mknod r${name}${unit}m	c $chr $(( $unit * 16 + $off + 12 ))
-		mknod r${name}${unit}n	c $chr $(( $unit * 16 + $off + 13 ))
-		mknod r${name}${unit}o	c $chr $(( $unit * 16 + $off + 14 ))
-		mknod r${name}${unit}p	c $chr $(( $unit * 16 + $off + 15 ))
-		chown root:operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-	done
+	blk=14; chr=19;
+	rm -f $name$unit? r$name$unit?
+	mknod ${name}${unit}a	b $blk $(( $unit * 16 + 0 ))
+	mknod ${name}${unit}b	b $blk $(( $unit * 16 + 1 ))
+	mknod ${name}${unit}c	b $blk $(( $unit * 16 + 2 ))
+	mknod ${name}${unit}d	b $blk $(( $unit * 16 + 3 ))
+	mknod ${name}${unit}e	b $blk $(( $unit * 16 + 4 ))
+	mknod ${name}${unit}f	b $blk $(( $unit * 16 + 5 ))
+	mknod ${name}${unit}g	b $blk $(( $unit * 16 + 6 ))
+	mknod ${name}${unit}h	b $blk $(( $unit * 16 + 7 ))
+	mknod ${name}${unit}i	b $blk $(( $unit * 16 + 8 ))
+	mknod ${name}${unit}j	b $blk $(( $unit * 16 + 9 ))
+	mknod ${name}${unit}k	b $blk $(( $unit * 16 + 10 ))
+	mknod ${name}${unit}l	b $blk $(( $unit * 16 + 11 ))
+	mknod ${name}${unit}m	b $blk $(( $unit * 16 + 12 ))
+	mknod ${name}${unit}n	b $blk $(( $unit * 16 + 13 ))
+	mknod ${name}${unit}o	b $blk $(( $unit * 16 + 14 ))
+	mknod ${name}${unit}p	b $blk $(( $unit * 16 + 15 ))
+	mknod r${name}${unit}a	c $chr $(( $unit * 16 + 0 ))
+	mknod r${name}${unit}b	c $chr $(( $unit * 16 + 1 ))
+	mknod r${name}${unit}c	c $chr $(( $unit * 16 + 2 ))
+	mknod r${name}${unit}d	c $chr $(( $unit * 16 + 3 ))
+	mknod r${name}${unit}e	c $chr $(( $unit * 16 + 4 ))
+	mknod r${name}${unit}f	c $chr $(( $unit * 16 + 5 ))
+	mknod r${name}${unit}g	c $chr $(( $unit * 16 + 6 ))
+	mknod r${name}${unit}h	c $chr $(( $unit * 16 + 7 ))
+	mknod r${name}${unit}i	c $chr $(( $unit * 16 + 8 ))
+	mknod r${name}${unit}j	c $chr $(( $unit * 16 + 9 ))
+	mknod r${name}${unit}k	c $chr $(( $unit * 16 + 10 ))
+	mknod r${name}${unit}l	c $chr $(( $unit * 16 + 11 ))
+	mknod r${name}${unit}m	c $chr $(( $unit * 16 + 12 ))
+	mknod r${name}${unit}n	c $chr $(( $unit * 16 + 13 ))
+	mknod r${name}${unit}o	c $chr $(( $unit * 16 + 14 ))
+	mknod r${name}${unit}p	c $chr $(( $unit * 16 + 15 ))
+	chown root:operator ${name}${unit}[a-p] r${name}${unit}[a-p]
+	chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 	umask 77
 	;;
 
diff --git a/src/etc/etc.palm/MAKEDEV b/src/etc/etc.palm/MAKEDEV
index 6d791a1a..8bbf37de 100644
--- a/src/etc/etc.palm/MAKEDEV
+++ b/src/etc/etc.palm/MAKEDEV
@@ -471,7 +471,6 @@ st*)
 
 vnd*)
 	dodisk vnd $U 19 19 $U 0
-	dodisk svnd $U 19 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index 55374b00..9eace84c 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -435,7 +435,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 2 11 $U 0
-	dodisk svnd $U 2 11 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV
index b92d3b14..6343171e 100644
--- a/src/etc/etc.socppc/MAKEDEV
+++ b/src/etc/etc.socppc/MAKEDEV
@@ -411,7 +411,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 14 19 $U 0
-	dodisk svnd $U 14 19 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index d11b079d..352ed649 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -475,7 +475,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 8 110 $U 0
-	dodisk svnd $U 8 110 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index 664936f8..5b492b1f 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -571,7 +571,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 8 110 $U 0
-	dodisk svnd $U 8 110 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index 2c765d3a..a45913d1 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -473,7 +473,6 @@ ch*)
 
 vnd*)
 	dodisk vnd $U 18 55 $U 0
-	dodisk svnd $U 18 55 $U 2048
 	;;
 
 rd*)
diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV
index 8cb63fdb..f21e23da 100644
--- a/src/etc/etc.zaurus/MAKEDEV
+++ b/src/etc/etc.zaurus/MAKEDEV
@@ -471,7 +471,6 @@ st*)
 
 vnd*)
 	dodisk vnd $U 19 19 $U 0
-	dodisk svnd $U 19 19 $U 2048
 	;;
 
 rd*)