svn commit: r217783 - user/nwhitehorn/bsdinstall/partedit

[Nathan Whitehorn]

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;