From owner-svn-src-user@FreeBSD.ORG  Mon Jan 24 14:53:53 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A858106566C;
	Mon, 24 Jan 2011 14:53:53 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 79B8C8FC0A;
	Mon, 24 Jan 2011 14:53:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0OErruN094110;
	Mon, 24 Jan 2011 14:53:53 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OErrM8094108;
	Mon, 24 Jan 2011 14:53:53 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101241453.p0OErrM8094108@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 24 Jan 2011 14:53:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217783 - user/nwhitehorn/bsdinstall/partedit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jan 2011 14:53:53 -0000

Author: nwhitehorn
Date: Mon Jan 24 14:53:53 2011
New Revision: 217783
URL: http://svn.freebsd.org/changeset/base/217783

Log:
  Skip WORM media (e.g. CD-ROMs) in the partition editor list. There will be
  a subsequent change to automatically set up mount points for these devices.

Modified:
  user/nwhitehorn/bsdinstall/partedit/partedit.c

Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c
==============================================================================
--- user/nwhitehorn/bsdinstall/partedit/partedit.c	Mon Jan 24 14:53:10 2011	(r217782)
+++ user/nwhitehorn/bsdinstall/partedit/partedit.c	Mon Jan 24 14:53:53 2011	(r217783)
@@ -299,7 +299,6 @@ read_geom_mesh(struct gmesh *mesh, int *
 	
 	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
 		if (strcmp(classp->lg_name, "DISK") != 0 &&
-		     strcmp(classp->lg_name, "ACD") != 0 &&
 		     strcmp(classp->lg_name, "MD") != 0)
 			continue;
 
@@ -333,6 +332,10 @@ add_geom_children(struct ggeom *gp, int 
 		if (strcmp(gp->lg_class->lg_name, "LABEL") == 0)
 			continue;
 
+		/* Skip WORM media */
+		if (strncmp(pp->lg_name, "cd", 2) == 0)
+			continue;
+
 		*items = realloc(*items,
 		    (*nitems+1)*sizeof(struct partedit_item));
 		(*items)[*nitems].indentation = recurse;