rules: remove DVB shell script

diff --git a/TODO b/TODO
index 8deff6aaf28cf4340f57ee6792cb8d59be136051..9214fb4874a3b459ac365e0714405b9c88585fc3 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,8 +1,7 @@
 
   o drop modprobe floppy alias (SUSE), it will be in the module (2.6.30)
-  o drop the DVB shell script rule (2.6.29)
   o remove MMC rules, they got a modalias now (2.6.30)
-  o add scsi:t-0x09* to "ch" and remove modprobe rule
+  o add scsi:t-0x09* to "ch" and remove modprobe rule (2.6.30)
   o switch device mapper rules to:
      dmsetup info -c --nameprefixes --unquoted --rows --noheadings \
        -o name,uuid,suspended,readonly,major,minor,open,tables_loaded

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 240cb3b3a6a940b087274e31f655ff3b4f3a3753..abc5113cfc1dcd396ebe6a68ee15c50859f0a110 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -43,7 +43,6 @@ SUBSYSTEM=="drm",             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"