X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=etc%2Fudev%2Fdebian%2Fpermissions.rules;h=bc97566b574ab2a544725f830e6a226c7c41ae7b;hp=52d7aa9536a908b6d8a3bf26801264b66e767b91;hb=6acd81c8981a5f0ea80e3cdef2a10e5d595bbae3;hpb=b7299fd904d33bc2d6845be535666b528fd18948

diff --git a/etc/udev/debian/permissions.rules b/etc/udev/debian/permissions.rules
index 52d7aa953..bc97566b5 100644
--- a/etc/udev/debian/permissions.rules
+++ b/etc/udev/debian/permissions.rules
@@ -1,12 +1,17 @@
+# workaround needed to make udevd wait for the "bus" link
+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", \
+	WAIT_FOR_SYSFS="bus"
+
 # default permissions for block devices
 SUBSYSTEM=="block",				GROUP="disk"
 SUBSYSTEM=="block", SYSFS{removable}=="1",	GROUP="floppy"
 
 # IDE devices
-BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}="1", \
-  PROGRAM="/bin/cat /proc/ide/%k/media", RESULT=="cdrom*",	GROUP="cdrom"
-BUS=="ide", KERNEL=="ht[0-9]*",					GROUP="tape"
-BUS=="ide", KERNEL=="nht[0-9]*",				GROUP="tape"
+BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", ACTION=="add", \
+	IMPORT{program}="/sbin/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"
@@ -17,6 +22,9 @@ BUS=="scsi", SYSFS{type}=="6",	GROUP="scanner"
 BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
 BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp"
 
+# usbfs-like devices
+SUBSYSTEM=="usb_device", MODE="0664"
+
 # serial devices
 SUBSYSTEM=="tty",	GROUP="dialout"
 SUBSYSTEM=="capi",	GROUP="dialout"
@@ -39,7 +47,7 @@ SUBSYSTEM=="nvidia",	GROUP="video"
 
 # misc devices
 KERNEL=="random",	MODE="0666"
-KERNEL=="urandom",	MODE="0444"
+KERNEL=="urandom",	MODE="0666"
 KERNEL=="mem",		MODE="0640", GROUP="kmem"
 KERNEL=="kmem",		MODE="0640", GROUP="kmem"
 KERNEL=="port",		MODE="0640", GROUP="kmem"
@@ -51,12 +59,17 @@ KERNEL=="sgi_fetchop",	MODE="0666"
 KERNEL=="sonypi",	MODE="0666"
 KERNEL=="agpgart",	GROUP="video"
 KERNEL=="nvram",	GROUP="nvram"
-KERNEL=="rtc",		MODE="0660", GROUP="audio"
+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"
@@ -72,7 +85,7 @@ KERNEL=="dv1394*",	GROUP="video"
 KERNEL=="video1394*",	GROUP="video"
 
 # input devices
-KERNEL=="event[0-9]*",	PROGRAM="/etc/udev/scripts/inputdev.sh %k", \
+KERNEL=="event[0-9]*",	PROGRAM="/lib/udev/inputdev.sh %k", \
 			RESULT=="inputdev", MODE="0664", GROUP="video"
 KERNEL=="js[0-9]*",	MODE="0664"