From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 16 Apr 2009 20:35:59 +0000 (+0200)
Subject: rules: remove DVB shell script
X-Git-Tag: 174~1095
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=7a87d34f8ab8572e3ff622b2785fb5fe2af2e07a

rules: remove DVB shell script
---

diff --git a/TODO b/TODO
index 8deff6aaf..9214fb487 100644
--- 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 240cb3b3a..abc5113cf 100644
--- 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"