summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-11-09 23:19:04 +0100
committerLennart Poettering <lennart@poettering.net>2009-11-09 23:19:04 +0100
commit088fbefafdf9deec211f7069b5ad0836f462cbab (patch)
tree21c8838454cdafdf18f3ee5e9184ae20cd2324a2
parent58e31304a4885fc242250ac6a06924bedf6e4e55 (diff)
Revert "sound: include ALSA sound card id in /dev/snd/by-id/ links"
This reverts commit 68bffc607f7f0414fee77fa481d9c133ce0798e9. After discussing this with Kay we decided to drop this again as by-id links only make sense for devices that have a unique serial id. If they don't any attempts to make them unique have the side effect of nourishing assumptions by users that cannot be met, as the by-id device link of a device could differ depending on the history of simultaneously plugged in device. So, to make sure that all device nodes follow the same rules for by-id/ symlinks, drop this patch again.
-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 624f57adec..a5206fdbb1 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", 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}"
+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}"
ENV{ID_PATH}=="", IMPORT{program}="path_id %p"
ENV{ID_PATH}=="?*", SYMLINK+="snd/by-path/$env{ID_PATH}"