update Debian rules

[elogind.git] / etc / udev / debian / udev.rules

diff --git a/etc/udev/debian/udev.rules b/etc/udev/debian/udev.rules
index 27eb43e54c28778caa0810e4e5902c77ca65cf77..b5dfd005720edc4a5131494f3a7a7aa7d0a3f71a 100644 (file)
--- a/etc/udev/debian/udev.rules
+++ b/etc/udev/debian/udev.rules
@@ -15,8 +15,7 @@
 
 # workaround for devices which do not report media changes
 BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}=="1", \
-  PROGRAM="/sbin/ata_id --export $tempnode", ENV{ID_MODEL}=="IOMEGA_ZIP*", \
-                                       NAME="%k", OPTIONS+="all_partitions"
+       ENV{ID_MODEL}=="IOMEGA_ZIP*",   NAME="%k", OPTIONS+="all_partitions"
 
 # SCSI devices
 BUS=="scsi", KERNEL=="sr[0-9]*",       NAME="scd%n", SYMLINK+="sr%n"
@@ -32,15 +31,15 @@ BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
                                        SYMLINK+="pilot"
 
 # usbfs-like devices
-SUBSYSTEM=="usb_device",       PROGRAM="/bin/sh -c 'K=%k K=$${K#usbdev} B=$${K%%%%.*} D=$${K#*.}; echo bus/usb/$$B/$$D'", \
-                               SYMLINK+="%c"
+SUBSYSTEM=="usb_device",       PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; B=$${K%%%%.*}; D=$${K#*.}; echo bus/usb/$$B/$$D'", \
+                               NAME="%c"
 
 # serial devices
 KERNEL=="capi",                        NAME="capi20", SYMLINK+="isdn/capi20"
 KERNEL=="capi[0-9]*",          NAME="capi/%n"
 
 # video devices
-KERNEL=="dvb*",                        PROGRAM="/bin/sh -c 'K=%k K=$${K#dvb} A=$${K%%%%.*} D=$${K#*.}; echo dvb/adapter$$A/$$D'", \
+KERNEL=="dvb*",                        PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; A=$${K%%%%.*}; D=$${K#*.}; echo dvb/adapter$$A/$$D'", \
                                NAME="%c"
 KERNEL=="card[0-9]*",          NAME="dri/%k"
 
@@ -59,7 +58,7 @@ KERNEL=="microcode",          NAME="cpu/microcode"
 KERNEL=="umad*",               NAME="infiniband/%k"
 KERNEL=="issm*",               NAME="infiniband/%k"
 KERNEL=="uverbs*",             NAME="infiniband/%k"
-KERNEL=="ucm",                 NAME="infiniband/%k"
+KERNEL=="ucm*",                        NAME="infiniband/%k"
 
 # ALSA devices
 KERNEL=="controlC[0-9]*",      NAME="snd/%k"
@@ -94,6 +93,6 @@ SUBSYSTEM=="aoe", KERNEL=="err",      NAME="etherd/%k"
 SUBSYSTEM=="aoe", KERNEL=="interfaces",        NAME="etherd/%k"
 
 # device mapper creates its own device nodes, so ignore these
-KERNEL=="dm-[0-9]*",           OPTIONS+="ignore_device"
+KERNEL=="dm-[0-9]*",           NAME=""
 KERNEL=="device-mapper",       NAME="mapper/control"