From fd3bfcf5e39c77037f821de8a706cb979f6d768f Mon Sep 17 00:00:00 2001 From: maxim Date: Mon, 1 Sep 2003 12:50:02 +0000 Subject: Retire 'c' partition for a CD device. Submitted by: Craig Rodrigues Not objected by: -current --- usr.sbin/cdcontrol/cdcontrol.1 | 8 ++++---- usr.sbin/cdcontrol/cdcontrol.c | 9 --------- 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'usr.sbin/cdcontrol') diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1 index 71216c5..a7adfb4 100644 --- a/usr.sbin/cdcontrol/cdcontrol.1 +++ b/usr.sbin/cdcontrol/cdcontrol.1 @@ -185,10 +185,10 @@ These variables have been deprecated in favour of .Ev CDROM . .El .Sh FILES -.Bl -tag -width ".Pa /dev/mcd0c" -compact -.It Pa /dev/cd0c -.It Pa /dev/mcd0c -.It Pa /dev/acd0c +.Bl -tag -width ".Pa /dev/mcd0" -compact +.It Pa /dev/cd0 +.It Pa /dev/mcd0 +.It Pa /dev/acd0 .El .Sh AUTHORS .An Jean-Marc Zucconi diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c index 3723217..77230b0 100644 --- a/usr.sbin/cdcontrol/cdcontrol.c +++ b/usr.sbin/cdcontrol/cdcontrol.c @@ -52,10 +52,6 @@ __FBSDID("$FreeBSD$"); # define DEFAULT_CD_DRIVE "/dev/cd0" #endif -#ifndef DEFAULT_CD_PARTITION -# define DEFAULT_CD_PARTITION "c" -#endif - #define CMD_DEBUG 1 #define CMD_EJECT 2 #define CMD_HELP 3 @@ -1249,11 +1245,6 @@ int open_cd () fd = open (devbuf, O_RDONLY); - if (fd < 0 && errno == ENOENT) { - strcat (devbuf, DEFAULT_CD_PARTITION); - fd = open (devbuf, O_RDONLY); - } - if (fd < 0) { if (errno == ENXIO) { /* ENXIO has an overloaded meaning here. -- cgit v1.1