Retire 'c' partition for a CD device.
Submitted by: Craig Rodrigues <rodrigc@crodrigues.org> Not objected by: -current
This commit is contained in:
parent
9958b55dce
commit
fd3bfcf5e3
@ -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
|
||||
|
@ -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.
|
||||
|
Loading…
x
Reference in New Issue
Block a user