update Debian rules

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

diff --git a/etc/udev/debian/devfs.rules b/etc/udev/debian/devfs.rules
index b1696c7d24d612cd84ae5c6ef2b46cd5d86ce7a2..c4a44e3e7f61cee56751a37227e666e8dd5eb5fd 100644 (file)
--- a/etc/udev/debian/devfs.rules
+++ b/etc/udev/debian/devfs.rules
@@ -15,20 +15,18 @@
 
 # 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"
 
 # IDE devices
-BUS=="ide", KERNEL=="hd[a-z]*", \
-  PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", \
+BUS=="ide", KERNEL=="hd[a-z]*", PROGRAM="/lib/udev/ide-devfs.sh %k %b %n", \
                                        NAME="%c{1}", SYMLINK+="%k %c{2}"
 
 # SCSI devices
-BUS=="scsi", PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \
+BUS=="scsi", PROGRAM="/lib/udev/scsi-devfs.sh %k %b %n", \
                                        NAME="%c{1}", SYMLINK+="%k %c{2}"
 
 # RAID controllers
-KERNEL=="cciss!*|ida!*|rd!*", PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", \
+KERNEL=="cciss!*|ida!*|rd!*", PROGRAM="/lib/udev/raid-devfs.sh %k", \
                                        NAME="%c{1}", SYMLINK+="%k"
 
 # other block devices
@@ -47,8 +45,8 @@ 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=="ttyS[0-9]*",          NAME="tts/%n"
@@ -69,7 +67,7 @@ KERNEL=="video[0-9]*",                NAME="v4l/%k"
 KERNEL=="radio[0-9]*",         NAME="v4l/%k"
 KERNEL=="vbi[0-9]*",           NAME="v4l/%k"
 KERNEL=="vtx[0-9]*",           NAME="v4l/%k"
-KERNEL=="dvb*",                        PROGRAM="/bin/sh -c 'KNAME=%k KNAME=$${KNAME#dvb} A=$${KNAME%%%%.*} D=$${KNAME#*.}; echo dvb/adapter$$A/$$D'", \
+KERNEL=="dvb*",                        PROGRAM="/bin/sh -c 'KNAME=%k; KNAME=$${KNAME#dvb}; A=$${KNAME%%%%.*}; D=$${KNAME#*.}; echo dvb/adapter$$A/$$D'", \
                                NAME="%c"
 KERNEL=="fb[0-9]*",            NAME="fb/%n"
 KERNEL=="card[0-9]*",          NAME="dri/%k"
@@ -101,7 +99,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"
 
 # sound devices
 KERNEL=="controlC[0-9]*",      NAME="snd/%k"
@@ -145,6 +143,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"