From e1cc6b6a81f9ed64e29eea5ccbe79616a220ee9f Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sat, 3 Jan 2009 22:30:05 +0100
Subject: [PATCH] rules: replace DVB shell script rule

---
 TODO                                | 5 ++---
 rules/rules.d/50-udev-default.rules | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TODO b/TODO
index 8cb24b807..dc5d9879c 100644
--- 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 b2b2ee949..38e1aa6b1 100644
--- 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"
-- 
2.30.2