Date: Sun, 17 Aug 2003 17:21:25 -0400 From: Craig Rodrigues <rodrigc@crodrigues.org> To: freebsd-current@freebsd.org Subject: cdcontrol no longer needs 'c' partition? Message-ID: <20030817212125.GA9911@crodrigues.org>
next in thread | raw e-mail | index | archive | help
Hi,
With GEOM in place, is the 'c' partition for a CD device no
longer necessary for cdcontrol? At least on my system,
the CD shows up as /dev/acd0, not as /dev/acd0c.
--- src/usr.sbin/cdcontrol/cdcontrol.c.orig Sun Aug 17 17:25:46 2003
+++ src/usr.sbin/cdcontrol/cdcontrol.c Sun Aug 17 17:27:49 2003
@@ -52,10 +52,6 @@
# 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
@@ -1248,11 +1244,6 @@
}
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) {
--- src/usr.sbin/cdcontrol/cdcontrol.1.orig Sun Aug 17 17:25:39 2003
+++ src/usr.sbin/cdcontrol/cdcontrol.1 Sun Aug 17 17:26:27 2003
@@ -185,10 +185,10 @@
.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
--
Craig Rodrigues
http://crodrigues.org
rodrigc@crodrigues.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030817212125.GA9911>