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 89e0db2aace799b7e234b844957c15eb1bb4d3a0..37e4ae1bc9ffed2bf15f1d2e8649ebe6cf394531 100644 (file)
--- a/etc/udev/debian/devfs.rules
+++ b/etc/udev/debian/devfs.rules
@@ -3,7 +3,6 @@
 #
 # %n the "kernel number" of the device.
 #    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
 # %k the kernel name for the device
 # %M the kernel major number for the device
 # %m the kernel minor number for the device
@@ -14,41 +13,42 @@
 #
 
 # workaround for devices which do not report media changes
-BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}=="1", \
-  PROGRAM="/etc/udev/scripts/ide-model.sh %k", RESULT=="IOMEGA ZIP *", \
-                               NAME="%k", OPTIONS+="all_partitions"
+SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \
+       ENV{ID_MODEL}=="IOMEGA_ZIP*",   NAME="%k", OPTIONS+="all_partitions"
+SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \
+       OPTIONS+="all_partitions"
 
 # IDE devices
-BUS=="ide", KERNEL=="hd[a-z]*", \
-  PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", \
-                               NAME="%c{1}", SYMLINK+="%k %c{2}"
+SUBSYSTEMS=="ide", KERNEL=="hd[a-z]*", PROGRAM="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", \
-                               NAME="%c{1}", SYMLINK+="%k %c{2}"
+SUBSYSTEMS=="scsi", PROGRAM="scsi-devfs.sh %k %b %n", \
+                                       NAME="%c{1}", SYMLINK+="%k %c{2}"
 
 # RAID controllers
-KERNEL=="cciss!*",     PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", \
-                               NAME="%c{1}", SYMLINK+="%k"
-KERNEL=="ida!*",       PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", \
-                               NAME="%c{1}", SYMLINK+="%k"
-KERNEL=="rd!*",                PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", \
-                               NAME="%c{1}", SYMLINK+="%k"
+KERNEL=="cciss!*|ida!*|rd!*", PROGRAM="raid-devfs.sh %k", \
+                                       NAME="%c{1}", SYMLINK+="%k"
 
 # other block devices
-KERNEL=="md[0-9]*",            NAME="md/%n",
-KERNEL=="loop[0-9]*",          NAME="loop/%n"
-KERNEL=="ram[0-9]*",           NAME="rd/%n"
+KERNEL=="md[0-9]*",                    NAME="md/%n",
+KERNEL=="loop[0-9]*",                  NAME="loop/%n"
+KERNEL=="ram[0-9]*",                   NAME="rd/%n"
 
 # USB devices
-BUS=="usb", KERNEL=="auer[0-9]*",      NAME="usb/%k"
-BUS=="usb", KERNEL=="cpad[0-9]*",      NAME="usb/%k"
-BUS=="usb", KERNEL=="dabusb*",         NAME="usb/%k"
-BUS=="usb", KERNEL=="hiddev*",         NAME="usb/%k"
-BUS=="usb", KERNEL=="legousbtower*",   NAME="usb/%k"
-BUS=="usb", KERNEL=="lp[0-9]*",                NAME="usb/%k"
-BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
-                                       SYMLINK+="pilot"
+SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*",       NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*",       NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="dabusb*",          NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="hiddev*",          NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="legousbtower*",    NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*",         NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \
+       ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \
+                                               SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device",       PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
+                               NAME="%c"
 
 # serial devices
 KERNEL=="ttyS[0-9]*",          NAME="tts/%n"
@@ -69,7 +69,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="/etc/udev/scripts/dvb.sh %k", \
+KERNEL=="dvb*",                        PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", \
                                NAME="%c"
 KERNEL=="fb[0-9]*",            NAME="fb/%n"
 KERNEL=="card[0-9]*",          NAME="dri/%k"
@@ -82,6 +82,7 @@ KERNEL=="nvram",              NAME="misc/%k"
 KERNEL=="psaux",               NAME="misc/%k"
 KERNEL=="rtc",                 NAME="misc/%k"
 KERNEL=="tun",                 NAME="net/%k"
+KERNEL=="evtchn",              NAME="xen/%k"
 
 # printers and parallel devices
 KERNEL=="lp[0-9]*",            NAME="printers/%n"
@@ -100,6 +101,8 @@ 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"
 
 # sound devices
 KERNEL=="controlC[0-9]*",      NAME="snd/%k"
@@ -141,8 +144,9 @@ KERNEL=="zap[0-9]*",                NAME="zap/%n"
 SUBSYSTEM=="aoe", KERNEL=="discover",  NAME="etherd/%k"
 SUBSYSTEM=="aoe", KERNEL=="err",       NAME="etherd/%k"
 SUBSYSTEM=="aoe", KERNEL=="interfaces",        NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="revalidate",        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"