From 4ba75e6c70b23834fbb4fdff8e9646bcb93bff05 Mon Sep 17 00:00:00 2001
From: pk <pk@NetBSD.org>
Date: Thu, 19 Oct 1995 21:50:54 +0000
Subject: [PATCH] Lump cd and vnd device together with rest of disk devices.
 This also takes care of PR#1626.

---
 etc/etc.sparc/MAKEDEV | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index f2bdfd6eb75e..642f36a1aac7 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -155,16 +155,7 @@ tun*)
 	chown root.wheel tun$unit
 	;;
 
-vnd*)
-	name=vnd; blk=8; chr=110
-	rm -f ${name}${unit}c r${name}${unit}c
-	mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
-	mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
-	chgrp operator ${name}${unit}c r${name}${unit}c
-	chmod 640 ${name}${unit}c r${name}${unit}c
-	;;
-
-ccd*|fd*|sd*|xd*|xy*)
+ccd*|fd*|sd*|xd*|xy*|cd*|vnd*)
 	umask 2
 	case $i in
 	ccd*) name=ccd; blk=9; chr=23;;
@@ -172,10 +163,13 @@ ccd*|fd*|sd*|xd*|xy*)
 	sd*) name=sd; blk=7; chr=17;;
 	xd*) name=xd; blk=10; chr=42;;
 	xy*) name=xy; blk=3; chr=9;;
+	cd*)  name=cd; blk=18; chr=58;;
+	vnd*) name=vnd; blk=8; chr=110;;
 	esac
 	case $unit in
 	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|\
 	17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)
+		rm -f ${name}${unit}[a-h] r${name}${unit}[a-h]
 		mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
 		mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
 		mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
@@ -240,21 +234,6 @@ ch*)
 	umask 77
 	;;
 
-cd*)
-	umask 2
-	case $i in
-	cd*) name=cd; blk=18; chr=58;;
-	esac
-	rm -f $name$unit? r$name$unit?
-	mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
-	mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
-	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
-	mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
-	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
-	umask 77
-	;;
-
 lkm)
 	rm -f lkm
 	mknod lkm c 112 0