X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2Frules.d%2F60-persistent-alsa.rules;h=8154e2dbb5ea3e498b93a74b6fac3bf0d7169203;hp=39a365221eee5ea28b2df7da80de27e4ae3e2a59;hb=220893b3cbdbf8932f95c44811b169a8f0d33939;hpb=4b06c409350d26af5e6ace0f368d01b80d75438e

diff --git a/rules/rules.d/60-persistent-alsa.rules b/rules/rules.d/60-persistent-alsa.rules
index 39a365221..8154e2dbb 100644
--- a/rules/rules.d/60-persistent-alsa.rules
+++ b/rules/rules.d/60-persistent-alsa.rules
@@ -4,12 +4,11 @@ ACTION=="remove", GOTO="persistent_alsa_end"
 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", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
+ENV{ID_SERIAL}=="?*", ENV{ID_USB_INTERFACE_NUM}=="?*", SYMLINK+="snd/by-id/$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_USB_INTERFACE_NUM}"
+ENV{ID_SERIAL}=="?*", ENV{ID_USB_INTERFACE_NUM}=="", SYMLINK+="snd/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
 
-ENV{ID_PATH}=="", IMPORT{program}="path_id %p"
+IMPORT{builtin}="path_id"
 ENV{ID_PATH}=="?*", SYMLINK+="snd/by-path/$env{ID_PATH}"
 
 LABEL="persistent_alsa_end"