From owner-freebsd-current@FreeBSD.ORG Sun Aug 17 14:27:40 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 288AC37B404 for ; Sun, 17 Aug 2003 14:27:40 -0700 (PDT) Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.86.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id C38CD43F85 for ; Sun, 17 Aug 2003 14:27:38 -0700 (PDT) (envelope-from phk@phk.freebsd.dk) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.12.9/8.12.9) with ESMTP id h7HLRNlX030766; Sun, 17 Aug 2003 23:27:28 +0200 (CEST) (envelope-from phk@phk.freebsd.dk) To: Craig Rodrigues From: "Poul-Henning Kamp" In-Reply-To: Your message of "Sun, 17 Aug 2003 17:21:25 EDT." <20030817212125.GA9911@crodrigues.org> Date: Sun, 17 Aug 2003 23:27:23 +0200 Message-ID: <30765.1061155643@critter.freebsd.dk> 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: Sun, 17 Aug 2003 21:27:40 -0000 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 ? Poul-Henning In message <20030817212125.GA9911@crodrigues.org>, Craig Rodrigues writes: >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 >_______________________________________________ >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.