[PATCH] 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 65a89ae5932e45d4a7b495e13fa87118f9369c57..a506a02ad33eb36c310ff351348908aec5162570 100644 (file)
--- a/etc/udev/debian/udev.rules
+++ b/etc/udev/debian/udev.rules
@@ -13,35 +13,48 @@
 # %% the '%' char itself.
 #
 
-# permissions for IDE CD devices
-BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom*", NAME="%k", MODE="0660", GROUP="cdrom"
-
-# permissions for IDE floppy devices
-BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="floppy*", NAME="%k", MODE="0660", GROUP="floppy"
-
-# permissions for SCSI CD devices
-BUS="scsi", KERNEL="sr[0-9]*", SYSFS{type}="5", NAME="scd%n", MODE="0660", GROUP="cdrom", SYMLINK="sr%n"
-BUS="scsi", KERNEL="sg[0-9]*", SYSFS{type}="5", NAME="%k", MODE="0660", GROUP="cdrom"
+# 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 *", \
+  OPTIONS="all_partitions", NAME="%k"
 
+# SCSI devices
+BUS="scsi", KERNEL="sr[0-9]*", NAME="scd%n", SYMLINK="sr%n"
 
 # USB devices
 BUS="usb", KERNEL="hiddev*",   NAME="usb/%k"
-BUS="usb", KERNEL="auer*",     NAME="usb/%k"
+BUS="usb", KERNEL="auer[0-9]*",        NAME="usb/%k"
 BUS="usb", KERNEL="legousbtower*", NAME="usb/%k"
 BUS="usb", KERNEL="dabusb*",   NAME="usb/%k"
-BUS="usb", KERNEL="lp[0-9]*",  NAME="usb/%k"
 BUS="usb", KERNEL="cpad[0-9]*",        NAME="usb/%k"
+BUS="usb", KERNEL="lp[0-9]*",  NAME="usb/%k"
+BUS="usb", KERNEL="ttyUSB*", SYSFS{product}="Palm Handheld*", SYMLINK="pilot"
+
+# serial devices
+KERNEL="capi",         NAME="capi20", SYMLINK="isdn/capi20"
+KERNEL="capi[0-9]*",   NAME="capi/%n"
 
+# video devices
 KERNEL="dvb*",         PROGRAM="/etc/udev/scripts/dvb.sh %k", NAME="%c"
+KERNEL="card[0-9]*",   NAME="dri/%k"
+
+# misc devices
+KERNEL="hw_random",    NAME="hwrng"
 
-KERNEL="card*",                NAME="dri/card%n"
 KERNEL="cdemu[0-9]*",  NAME="cdemu/%n"
 KERNEL="pktcdvd[0-9]*",        NAME="pktcdvd/%n"
 KERNEL="pktcdvd",      NAME="pktcdvd/control"
+
 KERNEL="cpu[0-9]*",    NAME="cpu/%n/cpuid"
 KERNEL="msr[0-9]*",    NAME="cpu/%n/msr"
 KERNEL="microcode",    NAME="cpu/microcode"
 
+KERNEL="umad*",                NAME="infiniband/%k"
+KERNEL="issm*",                NAME="infiniband/%k"
+
+KERNEL="tap[0-9]*",    NAME="net/%k"
+KERNEL="tun",          NAME="net/%k"
+
 # ALSA devices
 KERNEL="controlC[0-9]*", NAME="snd/%k"
 KERNEL="hwC[D0-9]*",   NAME="snd/%k"
@@ -53,19 +66,11 @@ KERNEL="seq",               NAME="snd/%k"
 # input devices
 KERNEL="mice",         NAME="input/%k"
 KERNEL="mouse[0-9]*",  NAME="input/%k"
-KERNEL="event[0-9]*",  NAME="input/%k", PROGRAM="/etc/udev/scripts/inputdev.sh %k", RESULT="inputdev", MODE="0664", GROUP="video"
 KERNEL="event[0-9]*",  NAME="input/%k"
 KERNEL="js[0-9]*",     NAME="input/%k"
 KERNEL="ts[0-9]*",     NAME="input/%k"
 KERNEL="uinput",       NAME="input/%k"
 
-KERNEL="tap[0-9]*",    NAME="net/%k"
-KERNEL="tun",          NAME="net/%k"
-
-# CAPI devices
-KERNEL="capi",         NAME="capi20", SYMLINK="isdn/capi20"
-KERNEL="capi[0-9]*",   NAME="capi/%n"
-
 # Zaptel
 KERNEL="zapctl",       NAME="zap/ctl"
 KERNEL="zaptimer",     NAME="zap/timer"
@@ -73,7 +78,12 @@ KERNEL="zapchannel", NAME="zap/channel"
 KERNEL="zappseudo",    NAME="zap/pseudo"
 KERNEL="zap[0-9]*",    NAME="zap/%n"
 
+# AOE character devices
+SUBSYSTEM="aoe", KERNEL="discover",    NAME="etherd/%k"
+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]*",    NAME=""
+KERNEL="dm-[0-9]*",    OPTIONS="ignore_device"
 KERNEL="device-mapper",        NAME="mapper/control"