From 390f27ff45df6c6476d34a2d1bef5b480b25f87a Mon Sep 17 00:00:00 2001
From: gvf <gvf@openbsd.org>
Date: Wed, 23 Apr 1997 20:38:59 +0000
Subject: [PATCH] Fix vnd nodes.

---
 etc/etc.amiga/MAKEDEV  | 5 +----
 etc/etc.arc/MAKEDEV    | 4 +---
 etc/etc.atari/MAKEDEV  | 3 ---
 etc/etc.pmax/MAKEDEV   | 5 +----
 etc/etc.wgrisc/MAKEDEV | 5 +----
 etc/etc.x68k/MAKEDEV   | 7 ++-----
 6 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/etc/etc.amiga/MAKEDEV b/etc/etc.amiga/MAKEDEV
index 3e88f6f6a1b..2583bb334ce 100644
--- a/etc/etc.amiga/MAKEDEV
+++ b/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.18 1996/12/14 18:23:50 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.19 1997/04/23 20:38:59 gvf Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -213,8 +213,6 @@ sd*|vnd*|ccd*|wd*)
 	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15)
 		mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + 2`
 		mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + 2`
-		if [ $name != cd -a $name != vnd ]
-		then
 		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`
 		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + 1`
 		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
@@ -245,7 +243,6 @@ sd*|vnd*|ccd*|wd*)
 		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
 		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
 		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
-		fi
 		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
 		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 		;;
diff --git a/etc/etc.arc/MAKEDEV b/etc/etc.arc/MAKEDEV
index 7f6112f185a..345729f0a99 100644
--- a/etc/etc.arc/MAKEDEV
+++ b/etc/etc.arc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.10 1997/04/07 11:49:42 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.11 1997/04/23 20:39:01 gvf Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -166,7 +166,6 @@ fd*|sd*|vnd*)
 	    mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + 0`
 	    mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + 2`
 	    mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + 2`
-	    if [ $name != vnd ]; then
 		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + 1`
 		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
 		mknod ${name}${unit}e	b $blk `expr $unit '*' 16 + 4`
@@ -195,7 +194,6 @@ fd*|sd*|vnd*)
 		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
 		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
 		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
-	    fi
 	    chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
 	    chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 	    ;;
diff --git a/etc/etc.atari/MAKEDEV b/etc/etc.atari/MAKEDEV
index 67193b72157..654bdb9e634 100644
--- a/etc/etc.atari/MAKEDEV
+++ b/etc/etc.atari/MAKEDEV
@@ -217,8 +217,6 @@ sd*|vnd*|ccd*)
 	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15)
 		mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + 2`
 		mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + 2`
-		if [ $name != cd -a $name != vnd ]
-		then
 		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`
 		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + 1`
 		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
@@ -249,7 +247,6 @@ sd*|vnd*|ccd*)
 		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
 		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
 		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
-		fi
 		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
 		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 		;;
diff --git a/etc/etc.pmax/MAKEDEV b/etc/etc.pmax/MAKEDEV
index 0ff61cef0c3..2ba5b4849eb 100644
--- a/etc/etc.pmax/MAKEDEV
+++ b/etc/etc.pmax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.11 1997/02/03 10:29:13 graichen Exp $
+#	$OpenBSD: MAKEDEV,v 1.12 1997/04/23 20:39:04 gvf Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -130,8 +130,6 @@ rz*|vnd*|vn*|ccd*)
 	0|1|2|3|4|5|6)
 		mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
 		mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
-		if [ $name != vnd ]
-		then
 		mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
 		mknod ${name}${unit}b	b $blk `expr $unit '*' 8 + 1`
 		mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
@@ -146,7 +144,6 @@ rz*|vnd*|vn*|ccd*)
 		mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
 		mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
 		mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
-		fi
 		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
diff --git a/etc/etc.wgrisc/MAKEDEV b/etc/etc.wgrisc/MAKEDEV
index f6f2b8a38f4..31dbf231dde 100644
--- a/etc/etc.wgrisc/MAKEDEV
+++ b/etc/etc.wgrisc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.1 1997/04/09 09:04:43 pefo Exp $
+#	$OpenBSD: MAKEDEV,v 1.2 1997/04/23 20:39:05 gvf Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -124,8 +124,6 @@ cd*|sd*|vnd*)
 	0|1|2|3|4|5|6)
 	    mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + 2`
 	    mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + 2`
-	    if [ $name != vnd ]
-	    then
 		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`
 		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + 1`
 		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
@@ -156,7 +154,6 @@ cd*|sd*|vnd*)
 		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
 		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
 		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
-	    fi
 	    chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
 	    chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 	    ;;
diff --git a/etc/etc.x68k/MAKEDEV b/etc/etc.x68k/MAKEDEV
index e8360e1f174..3ab91c7d8ca 100644
--- a/etc/etc.x68k/MAKEDEV
+++ b/etc/etc.x68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.6 1996/12/14 18:24:05 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.7 1997/04/23 20:39:06 gvf Exp $
 #	$NetBSD: MAKEDEV,v 1.1.1.1.4.1 1996/06/17 02:36:16 oki Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -34,7 +34,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: MAKEDEV,v 1.6 1996/12/14 18:24:05 millert Exp $
+#	$Id: MAKEDEV,v 1.7 1997/04/23 20:39:06 gvf Exp $
 #
 #	from:
 #	hp300/MAKEDEV (1/15/94), from:
@@ -214,8 +214,6 @@ sd*|vnd*|ccd*)
 	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15)
 		mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
 		mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
-		if [ $name != cd -a $name != vnd ]
-		then
 		mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
 		mknod ${name}${unit}b	b $blk `expr $unit '*' 8 + 1`
 		mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
@@ -230,7 +228,6 @@ sd*|vnd*|ccd*)
 		mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
 		mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
 		mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
-		fi
 		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
-- 
2.20.1