diff options
| author | Garrett D'Amore <Garrett.Damore@Sun.COM> | 2009-09-20 07:48:31 -0700 |
|---|---|---|
| committer | Garrett D'Amore <Garrett.Damore@Sun.COM> | 2009-09-20 07:48:31 -0700 |
| commit | 92e8aa2f28291f13555b38cb0adf7e84b2b83cae (patch) | |
| tree | c10c94dd2158cfe37012c5f27cc91d2e51f1ea86 /usr/src | |
| parent | 17e9b2b79f1b6ad823020c5671e72cfa3fc10c7e (diff) | |
| download | illumos-gate-92e8aa2f28291f13555b38cb0adf7e84b2b83cae.tar.gz | |
6837800 Devlinks needs to be cleaned if the device is not available
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/devfsadm/audio_link.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/usr/src/cmd/devfsadm/audio_link.c b/usr/src/cmd/devfsadm/audio_link.c index 9552b0aa4e..74eb1985d9 100644 --- a/usr/src/cmd/devfsadm/audio_link.c +++ b/usr/src/cmd/devfsadm/audio_link.c @@ -68,33 +68,32 @@ static devfsadm_remove_t audio_remove_cbt[] = { */ /* /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 + { "audio", "^audioctl$", + RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all }, - /* /dev/sound/0, 0ctl */ - { "audio", "^sound/[0-9]+(ctl)?$", - RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_link + { "audio", "^dsp$", + 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", "^mixer", + RM_POST|RM_HOT|RM_ALWAYS, ILEVEL_0, devfsadm_rm_all }, - - /* - * Primary links. - */ - - /* /dev/sndstat */ - { "pseudo", "^sndstat$", + { "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 }, }; |