update Debian rules

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

diff --git a/etc/udev/debian/permissions.rules b/etc/udev/debian/permissions.rules
index 52d7aa9536a908b6d8a3bf26801264b66e767b91..02bfefdd27bb5ca3d27c913f13f404f93adebddf 100644 (file)
--- a/etc/udev/debian/permissions.rules
+++ b/etc/udev/debian/permissions.rules
@@ -1,12 +1,14 @@
 # default permissions for block devices
 SUBSYSTEM=="block",                            GROUP="disk"
 SUBSYSTEM=="block", SYSFS{removable}=="1",     GROUP="floppy"
+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"
@@ -52,6 +54,7 @@ KERNEL=="sonypi",     MODE="0666"
 KERNEL=="agpgart",     GROUP="video"
 KERNEL=="nvram",       GROUP="nvram"
 KERNEL=="rtc",         MODE="0660", GROUP="audio"
+KERNEL=="tpm*",                MODE="0600", OWNER="tss", GROUP="tss"
 
 KERNEL=="cdemu[0-9]*", GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"