Mercurial > illumos > illumos-gate

changeset 10586:252cfb0aebde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6837800 Devlinks needs to be cleaned if the device is not available
author Garrett D'Amore <Garrett.Damore@Sun.COM>
date Sun, 20 Sep 2009 07:48:31 -0700
parents e59699fcc4b6
children e0d280fab007
files usr/src/cmd/devfsadm/audio_link.c
diffstat 1 files changed, 21 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/devfsadm/audio_link.c	Fri Sep 18 21:31:59 2009 -0700
+++ b/usr/src/cmd/devfsadm/audio_link.c	Sun Sep 20 07:48:31 2009 -0700
@@ -68,33 +68,32 @@
 	 */
 
 	/* /dev/audio, /dev/audioctl, /dev/dsp */
-	{ "audio", "^(audio|audioctl|dsp)$",
-	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_link
+	{ "audio", "^audio$",
+	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
 	},
-	/* /dev/mixer0, /dev/dsp0 */
-	{ "audio", "^(mixer|dsp)[0-9]+$",
-	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_link
-	},
-	/* /dev/sound/0, 0ctl */
-	{ "audio", "^sound/[0-9]+(ctl)?$",
-	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_link
+	{ "audio", "^audioctl$",
+	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
 	},
-	/* /dev/mixer */
-	{ "pseudo", "^(mixer)$",
-	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_link
+	{ "audio", "^dsp$",
+	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
 	},
-
-	/*
-	 * Primary links.
-	 */
-
-	/* /dev/sndstat */
-	{ "pseudo", "^sndstat$",
+	{ "audio", "^mixer",
+	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
+	},
+	{ "audio", "^sndstat$",
 	    RM_PRE|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
 	},
-	/* /dev/sound/audio810:0, 0ctl, etc */
-	{ "audio", "^sound/.*:[0-9]+(ctl|dsp|mixer)?$",
-	    RM_PRE|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
+	{ "audio", "^mixer[0-9]+$",
+	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
+	},
+	{ "audio", "^dsp[0-9]+$",
+	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
+	},
+	{ "audio", "^sound/[0-9]+$",
+	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
+	},
+	{ "audio", "^sound/[0-9]+ctl$",
+	    RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
 	},
 };