rules: replace DVB shell script rule

diff --git a/TODO b/TODO
index 8cb24b807cdabb97a86ae85670832d31f017cc66..dc5d9879cf81bfbbe959d8324842034428d703fe 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,9 +4,8 @@
      dmsetup info -c --nameprefixes --unquoted --rows --noheadings \
        -o name,uuid,suspended,readonly,major,minor,open,tables_loaded
   o implement path_id with libudev
-  o convert firmware.sh to C
-  o add DVB variables to kernel (patch merged in v4l tree), drop the
-    shell script rule
+  o convert firmware.sh to C (?)
+  o drop the DVB shell script rule (2.6.29+)
   o "udevadm control" commands will only accept the --<command> syntax
   o symlink names to udevadm will no longer be resolved to old command names
   o get distros to agree on a default set of rules

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index b2b2ee949f69f6cf4ab3b2592ebe90ca76df22ac..38e1aa6b15585119b8d937c611e29577e84b7f80 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -39,8 +39,9 @@ KERNEL=="pmu",                        GROUP="video"
 KERNEL=="nvidia*|nvidiactl*",  GROUP="video"
 SUBSYSTEM=="graphics",         GROUP="video"
 
-# DVB video
-SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
+# DVB (video)
+SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="?*", NAME="dvb/adapter$env{DVB_ADAPTER_NUM}/$env{DVB_DEVICE_TYPE}$env{DVB_DEVICE_NUM}", GROUP="video"
+SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
 # Firewire
 KERNEL=="dv1394[0-9]*",                NAME="dv1394/%n", GROUP="video"