diff options
| author | Maxim Konovalov <maxim@FreeBSD.org> | 2003-09-01 12:50:02 +0000 |
|---|---|---|
| committer | Maxim Konovalov <maxim@FreeBSD.org> | 2003-09-01 12:50:02 +0000 |
| commit | 167273225517ff03d8e6619c63f424b99173406a (patch) | |
| tree | 9f767c01c68c94f1740442e5fbccd5610a0d2c87 /usr.sbin/cdcontrol | |
| parent | ce1ee7895e0e93ac553faf421aad03da3c7be40f (diff) | |
| download | src-167273225517ff03d8e6619c63f424b99173406a.tar.gz src-167273225517ff03d8e6619c63f424b99173406a.zip | |
Retire 'c' partition for a CD device.
Submitted by: Craig Rodrigues <rodrigc@crodrigues.org>
Not objected by: -current
Notes
Notes:
svn path=/head/; revision=119653
Diffstat (limited to 'usr.sbin/cdcontrol')
| -rw-r--r-- | usr.sbin/cdcontrol/cdcontrol.1 | 8 | ||||
| -rw-r--r-- | usr.sbin/cdcontrol/cdcontrol.c | 9 |
2 files changed, 4 insertions, 13 deletions
diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1 index 71216c5ca888..a7adfb4ae272 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 3723217a33ab..77230b0fdf42 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. |