From owner-freebsd-current@FreeBSD.ORG Sun Aug 17 14:21:25 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60CC937B401 for ; Sun, 17 Aug 2003 14:21:25 -0700 (PDT) Received: from h00609772adf0.ne.client2.attbi.com (h00609772adf0.ne.client2.attbi.com [66.31.45.197]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C72D43F3F for ; Sun, 17 Aug 2003 14:21:24 -0700 (PDT) (envelope-from rodrigc@crodrigues.org) Received: from h00609772adf0.ne.client2.attbi.com (localhost.crodrigues.org [127.0.0.1])h7HLLQRR009956 for ; Sun, 17 Aug 2003 17:21:27 -0400 (EDT) (envelope-from rodrigc@h00609772adf0.ne.client2.attbi.com) Received: (from rodrigc@localhost)h7HLLQTa009955 for freebsd-current@freebsd.org; Sun, 17 Aug 2003 17:21:26 -0400 (EDT) Date: Sun, 17 Aug 2003 17:21:25 -0400 From: Craig Rodrigues To: freebsd-current@freebsd.org Message-ID: <20030817212125.GA9911@crodrigues.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i Subject: cdcontrol no longer needs 'c' partition? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2003 21:21:25 -0000 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