update Debian rules

1 files changed, 72 insertions, 60 deletions

diff --git a/etc/udev/debian/permissions.rules b/etc/udev/debian/permissions.rules
index bc97566b57..b010353a22 100644
--- a/etc/udev/debian/permissions.rules
+++ b/etc/udev/debian/permissions.rules
@@ -1,95 +1,107 @@
-# workaround needed to make udevd wait for the "bus" link
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", \
-	WAIT_FOR_SYSFS="bus"
+ACTION!="add", GOTO="permissions_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi",				WAIT_FOR_SYSFS="ioerr_cnt"
+# only needed for kernels < 2.6.16
+SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
 
 # default permissions for block devices
 SUBSYSTEM=="block",				GROUP="disk"
 SUBSYSTEM=="block", SYSFS{removable}=="1",	GROUP="floppy"
 
 # IDE devices
-BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", ACTION=="add", \
-	IMPORT{program}="/sbin/cdrom_id --export $tempnode"
+BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \
+	IMPORT{program}="cdrom_id --export $tempnode"
 ENV{ID_CDROM}=="?*",				GROUP="cdrom"
 BUS=="ide", KERNEL=="ht[0-9]*",			GROUP="tape"
 BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
 
 # SCSI devices
-BUS=="scsi", SYSFS{type}=="1",	GROUP="tape"
-BUS=="scsi", SYSFS{type}=="5",	GROUP="cdrom"
-BUS=="scsi", SYSFS{type}=="6",	GROUP="scanner"
+BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
+BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner"
+BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
+BUS=="scsi", SYSFS{type}=="6",			GROUP="scanner"
 
 # USB devices
 BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
-BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp"
+BUS=="usb", KERNEL=="lp[0-9]*",			GROUP="lp"
 
 # usbfs-like devices
-SUBSYSTEM=="usb_device", MODE="0664"
+SUBSYSTEM=="usb_device",	MODE="0664"
+
+# iRiver music players
+SUBSYSTEM=="usb_device",			GROUP="plugdev", \
+	SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]"
 
 # serial devices
-SUBSYSTEM=="tty",	GROUP="dialout"
-SUBSYSTEM=="capi",	GROUP="dialout"
-SUBSYSTEM=="slamr",	GROUP="dialout"
+SUBSYSTEM=="tty",				GROUP="dialout"
+SUBSYSTEM=="capi",				GROUP="dialout"
+SUBSYSTEM=="slamr",				GROUP="dialout"
+SUBSYSTEM=="zaptel",				GROUP="dialout"
 
 # vc devices (all members of the tty subsystem)
-KERNEL=="ptmx",		MODE="0666", GROUP="root"
-KERNEL=="console",	MODE="0600", GROUP="root"
-KERNEL=="tty",		MODE="0666", GROUP="root"
-KERNEL=="tty[0-9]*",	GROUP="root"
-KERNEL=="pty*",		MODE="0666", GROUP="tty"
+KERNEL=="ptmx",			MODE="0666",	GROUP="root"
+KERNEL=="console",		MODE="0600",	GROUP="root"
+KERNEL=="tty",			MODE="0666",	GROUP="root"
+KERNEL=="tty[0-9]*",				GROUP="root"
+KERNEL=="pty*",			MODE="0666",	GROUP="tty"
 
 # video devices
-SUBSYSTEM=="video4linux", GROUP="video"
-SUBSYSTEM=="drm",	GROUP="video"
-SUBSYSTEM=="dvb",	GROUP="video"
-SUBSYSTEM=="em8300",	GROUP="video"
-SUBSYSTEM=="graphics",	GROUP="video"
-SUBSYSTEM=="nvidia",	GROUP="video"
+SUBSYSTEM=="video4linux",			GROUP="video"
+SUBSYSTEM=="drm",				GROUP="video"
+SUBSYSTEM=="dvb",				GROUP="video"
+SUBSYSTEM=="em8300",				GROUP="video"
+SUBSYSTEM=="graphics",				GROUP="video"
+SUBSYSTEM=="nvidia",				GROUP="video"
 
 # misc devices
-KERNEL=="random",	MODE="0666"
-KERNEL=="urandom",	MODE="0666"
-KERNEL=="mem",		MODE="0640", GROUP="kmem"
-KERNEL=="kmem",		MODE="0640", GROUP="kmem"
-KERNEL=="port",		MODE="0640", GROUP="kmem"
-KERNEL=="full",		MODE="0666"
-KERNEL=="null",		MODE="0666"
-KERNEL=="zero",		MODE="0666"
-KERNEL=="inotify",	MODE="0666"
-KERNEL=="sgi_fetchop",	MODE="0666"
-KERNEL=="sonypi",	MODE="0666"
-KERNEL=="agpgart",	GROUP="video"
-KERNEL=="nvram",	GROUP="nvram"
-KERNEL=="rtc",		GROUP="audio"
-KERNEL=="tpm*",		MODE="0600", OWNER="tss", GROUP="tss"
-KERNEL=="fuse",		GROUP="fuse"
-
-KERNEL=="cdemu[0-9]*",	GROUP="cdrom"
-KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
-KERNEL=="pktcdvd",	MODE="0644"
-
-KERNEL=="uverbs*",	GROUP="rdma"
-KERNEL=="ucm*",		GROUP="rdma"
+KERNEL=="random",		MODE="0666"
+KERNEL=="urandom",		MODE="0666"
+KERNEL=="mem",			MODE="0640",	GROUP="kmem"
+KERNEL=="kmem",			MODE="0640",	GROUP="kmem"
+KERNEL=="port",			MODE="0640",	GROUP="kmem"
+KERNEL=="full",			MODE="0666"
+KERNEL=="null",			MODE="0666"
+KERNEL=="zero",			MODE="0666"
+KERNEL=="inotify",		MODE="0666"
+KERNEL=="sgi_fetchop",		MODE="0666"
+KERNEL=="sonypi",		MODE="0666"
+KERNEL=="agpgart",				GROUP="video"
+KERNEL=="nvram",				GROUP="nvram"
+KERNEL=="rtc",					GROUP="audio"
+KERNEL=="tpm*",			MODE="0600",	OWNER="tss", GROUP="tss"
+KERNEL=="fuse",					GROUP="fuse"
+
+KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
+KERNEL=="pktcdvd",		MODE="0644"
+
+KERNEL=="uverbs*",				GROUP="rdma"
+KERNEL=="ucm*",					GROUP="rdma"
 
 # printers and parallel devices
-SUBSYSTEM=="printer",	GROUP="lp"
-SUBSYSTEM=="ppdev",	GROUP="lp"
-KERNEL=="pt[0-9]*",	GROUP="tape"
-KERNEL=="pht[0-9]*",	GROUP="tape"
+SUBSYSTEM=="printer",				GROUP="lp"
+SUBSYSTEM=="ppdev",				GROUP="lp"
+KERNEL=="pt[0-9]*",				GROUP="tape"
+KERNEL=="pht[0-9]*",				GROUP="tape"
 
 # sound devices
-SUBSYSTEM=="sound",	GROUP="audio"
+SUBSYSTEM=="sound",				GROUP="audio"
 
 # ieee1394 devices       
-KERNEL=="raw1394",	GROUP="disk"
-KERNEL=="dv1394*",	GROUP="video"
-KERNEL=="video1394*",	GROUP="video"
+KERNEL=="raw1394",				GROUP="disk"
+KERNEL=="dv1394*",				GROUP="video"
+KERNEL=="video1394*",				GROUP="video"
 
 # input devices
-KERNEL=="event[0-9]*",	PROGRAM="/lib/udev/inputdev.sh %k", \
-			RESULT=="inputdev", MODE="0664", GROUP="video"
-KERNEL=="js[0-9]*",	MODE="0664"
+KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \
+				MODE="0664",	GROUP="video"
+KERNEL=="js[0-9]*",		MODE="0664"
 
 # AOE character devices
-SUBSYSTEM=="aoe",			MODE="0220", GROUP="disk"
-SUBSYSTEM=="aoe", KERNEL=="err",	MODE="0440"
+SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
+
+LABEL="permissions_end"