6884610 Serial ports are no longer in /devices/isa so tip breaks due …

…to 6813425
TritonDataCenter · Feb 2, 2010 · 94ee2d0 · 94ee2d0
1 parent fb5dd80
commit 94ee2d0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/usr/src/cmd/devfsadm/i386/misc_link_i386.c b/usr/src/cmd/devfsadm/i386/misc_link_i386.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -68,6 +68,7 @@ static devfsadm_create_t misc_cbt[] = {
 	{ "pseudo", "ddi_pseudo", "smbios",
 	    TYPE_EXACT | DRV_EXACT, ILEVEL_1, smbios,
 	},
+	/* floppies share the same class, but not link regex, as hard disks */
 	{ "disk",  "ddi_block:diskette", NULL,
 	    TYPE_EXACT, ILEVEL_1, diskette
 	},
@@ -152,6 +153,21 @@ static devfsadm_remove_t misc_remove_cbt[] = {
 	},
 	{ "pseudo", "^ucode$", RM_ALWAYS | RM_PRE | RM_HOT,
 		ILEVEL_0, devfsadm_rm_all
+	},
+	{ "mouse", "^kdmouse$", RM_ALWAYS | RM_PRE,
+		ILEVEL_0, devfsadm_rm_all
+	},
+	{ "disk", "^(diskette|rdiskette)([0-9]*)$",
+		RM_ALWAYS | RM_PRE, ILEVEL_1, devfsadm_rm_all
+	},
+	{ "parallel", "^(lp|ecpp)([0-9]+)$", RM_ALWAYS | RM_PRE,
+		ILEVEL_1, devfsadm_rm_all
+	},
+	{ "serial", "^(tty|ttyd)([0-9]+)$", RM_ALWAYS | RM_PRE,
+		ILEVEL_1, devfsadm_rm_all
+	},
+	{ "serial", "^tty[a-z]$", RM_ALWAYS | RM_PRE,
+		ILEVEL_1, devfsadm_rm_all
 	}
 };
 

diff --git a/usr/src/cmd/devfsadm/port_link.c b/usr/src/cmd/devfsadm/port_link.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -191,10 +191,12 @@ DEVFSADM_CREATE_INIT_V0(ports_cbt);
  * no cleanup rules for PCMCIA port devices
  */
 static devfsadm_remove_t ports_remove_cbt[] = {
-	{"port", "^term/[0-9]+$", RM_PRE | RM_HOT, ILEVEL_0, rm_dangling_port},
-	{"port", "^cua/[0-9]+$", RM_PRE | RM_HOT, ILEVEL_0, devfsadm_rm_all},
+	{"port", "^term/[0-9]+$", RM_PRE | RM_ALWAYS | RM_HOT, ILEVEL_0,
+	    rm_dangling_port},
+	{"port", "^cua/[0-9]+$", RM_PRE | RM_ALWAYS | RM_HOT, ILEVEL_0,
+	    devfsadm_rm_all},
 	{"port", "^(term|cua)/[a-z]$",
-	    RM_PRE, ILEVEL_0, devfsadm_rm_all},
+	    RM_PRE | RM_ALWAYS, ILEVEL_0, devfsadm_rm_all},
 };
 DEVFSADM_REMOVE_INIT_V0(ports_remove_cbt);