From eb1666c084717d0b725d81051f4edd709d1729e6 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 30 Jul 1999 18:49:36 +0000
Subject: [PATCH] no more acd

---
 src/etc/etc.alpha/MAKEDEV | 10 ++++------
 src/etc/etc.amiga/MAKEDEV | 10 ++++------
 src/etc/etc.arc/MAKEDEV   | 10 ++++------
 src/etc/etc.i386/MAKEDEV  | 12 +++++-------
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index f57f5a5b..4451cd79 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.42 1998/12/19 18:35:36 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.43 1999/07/30 18:49:35 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.8.4.1 1996/06/18 00:41:56 cgd Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -49,7 +49,6 @@
 #	vnd*	"file" pseudo-disks
 #	ccd*	concatenated disk devices
 #	wd*	ISA "winchester" disk drives (ST506,IDE,ESDI,RLL,...)
-#	acd*	ISA ATAPI cdrom drives
 #
 # Terminal ports:
 #	ttyB?	DEC 3000 ZS8530 ("scc") serial ports
@@ -147,7 +146,7 @@ case $i in
 all)
 	sh $this std fd sd0 sd1 sd2 sd3 sd4 pty0 pty1
 	sh $this st0 st1 ch0 cd0 cd1 vnd0 vnd1 vnd2 vnd3
-	sh $this ccd0 ccd1 ccd2 ccd3 wd0 wd1 wd2 wd3 acd0 acd1
+	sh $this ccd0 ccd1 ccd2 ccd3 wd0 wd1 wd2 wd3
 	sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	sh $this tun0 tun1 tun2 tun3
 	sh $this ttyB0 ttyB1 ttyC0 ttyC1 ttyE0 ttyE1 lkm
@@ -160,7 +159,7 @@ all)
 raminst)
 	sh $this std
 	sh $this sd0 sd1 sd2 wd0 st0
-	sh $this cd0 acd0
+	sh $this cd0
 	sh $this rd0 bpf0
 	sh $this ttyB0 ttyB1 ttyC0 ttyC1 ttyE0 ttyE1 pty0
 	;;
@@ -284,11 +283,10 @@ vnd*)
 	umask 77
 	;;
 
-cd*|acd*)
+cd*)
 	umask 2
 	case $i in
 	cd*)	name=cd;	blk=3; chr=13;;
-	acd*)	name=acd;	blk=4; chr=37;;
 	esac
 	rm -f $name$unit? r$name$unit?
 	mknod ${name}${unit}a	b $blk `add $(mult $unit 16) 0` 
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index f47575b5..eab587c0 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.41 1998/11/25 04:58:53 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.42 1999/07/30 18:49:35 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -56,7 +56,6 @@
 #	vnd*	"file" pseudo-disks
 #	ccd*	concatenated disk devices
 #	wd*	ISA "winchester" disk drives (ST506,IDE,ESDI,RLL,...)
-#	acd*	ISA ATAPI cdrom drives
 #
 # Console ports:
 #	ttye*	ite bitmapped consoles
@@ -169,7 +168,7 @@ all)
 	sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	sh $this view00 view01 view02 view03 view04 view05 pty0 pty1
 	sh $this lpa0 lpa1 lpt0 lpt1 lpt2 ipl
-	sh $this ccd0 ccd1 ccd2 ccd3 wd0 wd1 acd0 ch0 uk0 uk1
+	sh $this ccd0 ccd1 ccd2 ccd3 wd0 wd1 ch0 uk0 uk1
 	sh $this tun0 tun1 par0 lkm ss0 random audio0 xfs0 local
 	;;
 
@@ -177,7 +176,7 @@ floppy|ramdisk)
 	sh $this std kbd pty0 tty00 ttyA0 ttyA1 ttyB0 ttyB1
 	sh $this ttye0 ttye1 ttye2 ttye3 ttye4 ttye5 ttye6
 	sh $this cd0 cd1 sd0 sd1 sd2 sd3 st0 st1
-	sh $this fd0 fd1 wd0 wd1 acd0 rd0 random
+	sh $this fd0 fd1 wd0 wd1 rd0 random
 	;;
 
 std)
@@ -375,11 +374,10 @@ ch*)
 	umask 77
 	;;
 
-cd*|acd*)
+cd*)
 	umask 2 ; unit=`expr $i : '.*cd\(.*\)'`
 	case $i in
 	cd*) name=cd; blk=7; chr=9;;
-	acd*) name=acd; blk=15; chr=38;;
 	esac
 	rm -f $name$unit? r$name$unit?
 	case $unit in
diff --git a/src/etc/etc.arc/MAKEDEV b/src/etc/etc.arc/MAKEDEV
index eecba4ab..5d67ef83 100644
--- a/src/etc/etc.arc/MAKEDEV
+++ b/src/etc/etc.arc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.30 1998/11/25 04:58:53 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.31 1999/07/30 18:49:36 deraadt Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -18,7 +18,6 @@
 #	sd*	SCSI disks
 #	wd*	ISA "winchester" disk drives (ST506,IDE,ESDI,RLL,...)
 #	cd*	SCSI cdrom drives
-#	acd*	ISA ATAPI cdrom drives
 #	vnd*	"file" pseudo-disks
 #	rd*	"ramdisk" pseudo-disks
 #	ccd*	concatenated disk devices
@@ -118,7 +117,7 @@ unit=`unt $i`
 case $i in
 
 all)
-	sh $this std fd fd0 wd0 wd1 wd2 wd3 sd0 sd1 sd2 st0 acd0 cd0 ss0
+	sh $this std fd fd0 wd0 wd1 wd2 wd3 sd0 sd1 sd2 st0 cd0 ss0
 	sh $this ccd0 ccd1 ccd2 xfs0
 	sh $this vnd0 vnd1 vnd2 vnd3 tty00 tty01 tty02 tty03 pty0 pty1
 	sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
@@ -135,7 +134,7 @@ joy*)
 	;;
 
 ramdisk)
-	sh $this std fd0 wd0 wd1 wd2 wd3 sd0 sd1 sd2 st0 acd0 cd0 
+	sh $this std fd0 wd0 wd1 wd2 wd3 sd0 sd1 sd2 st0 cd0 
 	sh $this tty00 tty01 ttyC0 lpt0 random rd0
 	;;
 
@@ -353,11 +352,10 @@ vnd*)
 	umask 77
 	;;
 
-cd*|acd*)
+cd*)
 	umask 2 ; unit=`expr $i : '.*cd\(.*\)'`
 	case $i in
 	cd*) name=cd; blk=3; chr=8;;
-	acd*) name=acd; blk=6; char=19;;
 	esac
 	rm -f $name$unit? r$name$unit?
 	mknod ${name}${unit}a   b $blk `expr $unit '*' 16 + 0`
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index cb8c2922..519f92fc 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.70 1999/04/28 23:20:51 alex Exp $
+#	$OpenBSD: MAKEDEV,v 1.71 1999/07/30 18:49:36 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -41,7 +41,6 @@
 #	sd*	SCSI disks
 #	cd*	SCSI CD-ROM
 #	mcd*	Mitsumi CD-ROM
-#	acd*	ATAPI CD-ROM
 #	vnd*	"file" pseudo-disks
 #	rd*	"ramdisk" pseudo-disks
 #	ccd*	contatenated disk devices
@@ -113,7 +112,7 @@ all)
 	sh MAKEDEV std fd wt0 wd0 wd1 wd2 wd3 sd0 sd1 sd2
 	sh MAKEDEV tty00 tty01 tty02 tty03 pty0 pty1 st0 st1 ch0 cd0 cd1
 	sh MAKEDEV ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
-	sh MAKEDEV mcd0 acd0 vnd0 vnd1 lpa0 lpa1 ccd0 ccd1 ccd2 ccd3
+	sh MAKEDEV mcd0 vnd0 vnd1 lpa0 lpa1 ccd0 ccd1 ccd2 ccd3
 	sh MAKEDEV raid0 raid1 raid2 raid3 lpt0 lpt1 lpt2
 	sh MAKEDEV ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
 	sh MAKEDEV ipl tun0 tun1 tun2
@@ -130,13 +129,13 @@ all)
 
 floppy)
 	sh MAKEDEV std wt0 fd0 wd0 wd1 sd0 sd1 tty00 tty01
-	sh MAKEDEV st0 cd0 acd0 ttyC0 random
+	sh MAKEDEV st0 cd0 ttyC0 random
 	;;
 
 ramdisk)
 	sh MAKEDEV std lkm tty00 tty01 tty02 tty03 ttyC0 random
 	sh MAKEDEV wt0 fd0 rd0 wd0 wd1 wd2 wd3 bpf0
-	sh MAKEDEV sd0 sd1 sd2 sd3 st0 st1 cd0 cd1 acd0 mcd0
+	sh MAKEDEV sd0 sd1 sd2 sd3 st0 st1 cd0 cd1 mcd0
 	;;
 
 std)
@@ -446,12 +445,11 @@ ch*)
 	umask 77
 	;;
 
-cd*|mcd*|acd*)
+cd*|mcd*)
 	umask 2 ; unit=`expr $i : '.*cd\(.*\)'`
 	case $i in
 	cd*) name=cd; blk=6; chr=15;;
 	mcd*) name=mcd; blk=7; chr=39;;
-	acd*) name=acd; blk=18; chr=24;;
 	esac
 	rm -f $name$unit? r$name$unit?
 	mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`