Remove last remnants of acd(4), mcd(4), and scd(4) drivers.

Approved by:	jhb

6 files changed, 14 insertions, 24 deletions

diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 64d1acae11a9..254de3f6c9f9 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -32,7 +32,7 @@
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
 .\" $FreeBSD$
 .\"
-.Dd February 28, 2016
+.Dd August 25, 2016
 .Dt DD 1
 .Os
 .Sh NAME
@@ -414,7 +414,7 @@ Check for (even) parity errors on a file:
 To create an image of a Mode-1 CD-ROM, which is a commonly used format
 for data CD-ROM disks, use a block size of 2048 bytes:
 .Pp
-.Dl "dd if=/dev/acd0 of=filename.iso bs=2048"
+.Dl "dd if=/dev/cd0 of=filename.iso bs=2048"
 .Pp
 Write a filesystem image to a memory stick, padding the end with zeros,
 if necessary, to a 1MiB boundary:
diff --git a/sbin/ggate/ggatec/ggatec.8 b/sbin/ggate/ggatec/ggatec.8
index 705d42f657c2..b3840008fe19 100644
--- a/sbin/ggate/ggatec/ggatec.8
+++ b/sbin/ggate/ggatec/ggatec.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 14, 2015
+.Dd August 25, 2016
 .Dt GGATEC 8
 .Os
 .Sh NAME
@@ -161,10 +161,10 @@ option.
 Use a CD-ROM device on a remote host.
 .Bd -literal -offset indent
 server# cat /etc/gg.exports
-client RO /dev/acd0
+client RO /dev/cd0
 server# ggated
 
-client# ggatec create -o ro server /dev/acd0
+client# ggatec create -o ro server /dev/cd0
 ggate0
 client# mount_cd9660 /dev/ggate0 /cdrom
 .Ed
diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8
index f73e8a618eb1..77bd026d4336 100644
--- a/sbin/ggate/ggated/ggated.8
+++ b/sbin/ggate/ggated/ggated.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 27, 2016
+.Dd August 25, 2016
 .Dt GGATED 8
 .Os
 .Sh NAME
@@ -87,7 +87,7 @@ An alternate location for the exports file.
 .Pp
 The format of an exports file is as follows:
 .Bd -literal -offset indent
-1.2.3.4		RO	/dev/acd0
+1.2.3.4		RO	/dev/cd0
 1.2.3.0/24	RW	/tmp/test.img
 hostname	WO	/tmp/image
 .Ed
@@ -108,7 +108,7 @@ option.
 .Sh EXAMPLES
 Export CD-ROM device and a file:
 .Bd -literal -offset indent
-# echo "1.2.3.0/24 RO /dev/acd0" > /etc/gg.exports
+# echo "1.2.3.0/24 RO /dev/cd0" > /etc/gg.exports
 # echo "client RW /image" >> /etc/gg.exports
 # ggated
 .Ed
diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1
index f1e969d1baf0..4af7d7095a26 100644
--- a/usr.sbin/cdcontrol/cdcontrol.1
+++ b/usr.sbin/cdcontrol/cdcontrol.1
@@ -1,6 +1,6 @@
 .\" $FreeBSD$
 .\"
-.Dd June 27, 2008
+.Dd August 25, 2016
 .Dt CDCONTROL 1
 .Os
 .Sh NAME
@@ -17,9 +17,7 @@ The
 utility is a program to control audio features of a CD drive.
 The device is a name such
 as
-.Pa cd0
-or
-.Pa acd0 .
+.Pa cd0 .
 .Pp
 If no
 .Ar command
@@ -37,9 +35,7 @@ Verbose mode.
 Print as much information as possible.
 .It Fl f Ar device
 Specify a device, such as
-.Pa /dev/cd0
-or
-.Pa acd0 .
+.Pa /dev/cd0 .
 Both absolute path and relative to
 .Pa /dev
 filename are possible.
@@ -56,9 +52,7 @@ option is specified,
 tries opening first
 .Pa /dev/cdrom ,
 then
-.Pa /dev/cd0 ,
-and finally
-.Pa /dev/acd0 .
+.Pa /dev/cd0 .
 .El
 .Pp
 The available commands are listed below.
@@ -206,10 +200,8 @@ These variables have been deprecated in favour of
 .Ev CDROM .
 .El
 .Sh FILES
-.Bl -tag -width ".Pa /dev/mcd0" -compact
+.Bl -tag -width ".Pa /dev/cd0" -compact
 .It Pa /dev/cd0
-.It Pa /dev/mcd0
-.It Pa /dev/acd0
 .El
 .Sh HISTORY
 The
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c
index 70ef2f580922..546c20b6f94a 100644
--- a/usr.sbin/cdcontrol/cdcontrol.c
+++ b/usr.sbin/cdcontrol/cdcontrol.c
@@ -1292,8 +1292,6 @@ open_cd(void)
 	    fd = open(dev = "/dev/cdrom", O_RDONLY);
 	    if (fd < 0 && errno == ENOENT)
 		fd = open(dev = "/dev/cd0", O_RDONLY);
-	    if (fd < 0 && errno == ENOENT)
-		fd = open(dev = "/dev/acd0", O_RDONLY);
 	}
 
 	if (fd < 0) {
diff --git a/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh b/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh
index 4a15b8165d08..d46a7ffb3297 100755
--- a/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh
+++ b/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh
@@ -82,7 +82,7 @@ opt_mount()
   do
 
     # Loop though and look for an installation disk
-    for i in `ls -1 /dev/acd* /dev/cd* /dev/scd* /dev/rscd* 2>/dev/null`
+    for i in `ls -1 /dev/cd* 2>/dev/null`
     do
       # Find the CD Device
       /sbin/mount_cd9660 $i ${CDMNT}