summaryrefslogtreecommitdiff
path: root/rules/rules.d
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-11-09 22:11:29 +0100
committerLennart Poettering <lennart@poettering.net>2009-11-09 22:11:29 +0100
commit68bffc607f7f0414fee77fa481d9c133ce0798e9 (patch)
treec443025b3b57cffb2b78cb32abe67199aadc8fff /rules/rules.d
parent4e3664f22b39c3efa33f5778a651a083b5e1f544 (diff)
sound: include ALSA sound card id in /dev/snd/by-id/ links
If two USB sound cards that have the same serial number are plugged in make sure the by-id/ device node symlink is unique at least during runtime, by including the ALSA card id in the symlink name. This is a followup to ed1b2d9fc7.
Diffstat (limited to 'rules/rules.d')
-rw-r--r--rules/rules.d/60-persistent-alsa.rules6
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/rules.d/60-persistent-alsa.rules b/rules/rules.d/60-persistent-alsa.rules
index a5206fdbb1..624f57adec 100644
--- a/rules/rules.d/60-persistent-alsa.rules
+++ b/rules/rules.d/60-persistent-alsa.rules
@@ -5,9 +5,9 @@ SUBSYSTEM!="sound", GOTO="persistent_alsa_end"
KERNEL!="controlC[0-9]*", GOTO="persistent_alsa_end"
SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p"
-SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
-ENV{ID_SERIAL}=="?*", ENV{ID_IFACE}=="?*", SYMLINK+="snd/by-id/$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_IFACE}"
-ENV{ID_SERIAL}=="?*", ENV{ID_IFACE}=="", SYMLINK+="snd/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}!="", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
+ENV{ID_SERIAL}=="?*", ENV{ID_IFACE}=="?*", SYMLINK+="snd/by-id/$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_IFACE}-$attr{../id}"
+ENV{ID_SERIAL}=="?*", ENV{ID_IFACE}=="", SYMLINK+="snd/by-id/$env{ID_BUS}-$env{ID_SERIAL}-$attr{../id}"
ENV{ID_PATH}=="", IMPORT{program}="path_id %p"
ENV{ID_PATH}=="?*", SYMLINK+="snd/by-path/$env{ID_PATH}"