From owner-freebsd-current@FreeBSD.ORG Thu Aug 21 15:52:38 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 BB65416A4BF for ; Thu, 21 Aug 2003 15:52:38 -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 61B2943FB1 for ; Thu, 21 Aug 2003 15:52:34 -0700 (PDT) (envelope-from rodrigc@crodrigues.org) Received: from h00609772adf0.ne.client2.attbi.com (localhost.crodrigues.org [127.0.0.1])h7LMqfUR006860; Thu, 21 Aug 2003 18:52:41 -0400 (EDT) (envelope-from rodrigc@h00609772adf0.ne.client2.attbi.com) Received: (from rodrigc@localhost)h7LMqbge006859; Thu, 21 Aug 2003 18:52:37 -0400 (EDT) Date: Thu, 21 Aug 2003 18:52:36 -0400 From: Craig Rodrigues To: Poul-Henning Kamp Message-ID: <20030821225236.GA6733@crodrigues.org> References: <20030817212125.GA9911@crodrigues.org> <30765.1061155643@critter.freebsd.dk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <30765.1061155643@critter.freebsd.dk> User-Agent: Mutt/1.4i cc: freebsd-current@freebsd.org Subject: Re: 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: Thu, 21 Aug 2003 22:52:39 -0000 On Sun, Aug 17, 2003 at 11:27:23PM +0200, Poul-Henning Kamp wrote: > > Yes, the 'a' and 'c' partitions on CD drives are bogus, but this > has nothing directly to do with GEOM, it is only a sideeffect > of the semantic cleanups that went ahead of GEOM. > > The patch looks good to me, but I'd like somebody to test it > before it gets committed. Any takers ? Well, I tested it and it worked for me. :) > >--- 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 > >_______________________________________________ > >freebsd-current@freebsd.org mailing list > >http://lists.freebsd.org/mailman/listinfo/freebsd-current > >To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > > > > -- > Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 > phk@FreeBSD.ORG | TCP/IP since RFC 956 > FreeBSD committer | BSD since 4.3-tahoe > Never attribute to malice what can adequately be explained by incompetence. -- Craig Rodrigues http://crodrigues.org rodrigc@crodrigues.org