rules: SUSE update

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

diff --git a/etc/udev/debian/permissions.rules b/etc/udev/debian/permissions.rules
index 8b369596a341e3bc91fd948aff2711c72c465c95..ac6c0be38be8dd0a9c4694b043c2f45b61d5ae87 100644 (file)
--- a/etc/udev/debian/permissions.rules
+++ b/etc/udev/debian/permissions.rules
@@ -2,16 +2,20 @@ ACTION!="add", GOTO="permissions_end"
 
 # workarounds needed to synchronize with sysfs
 # only needed for kernels < v2.6.18-rc1
-DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",  WAIT_FOR_SYSFS="bus"
+ENV{PHYSDEVPATH}!="?*", 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"
 # only needed for kernels < 2.6.17
-SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*",    WAIT_FOR_SYSFS="device/driver"
+SUBSYSTEM=="net", ENV{DRIVER}=="?*",           WAIT_FOR_SYSFS="device/driver"
 
 # default permissions for block devices
 SUBSYSTEM=="block",                            GROUP="disk"
-SUBSYSTEM=="block", ATTRS{removable}=="1",     GROUP="floppy"
+# the aacraid driver is broken and reports that disks removable (see #404927)
+SUBSYSTEM=="block", ATTRS{removable}=="1", \
+       DRIVERS!="aacraid",                     GROUP="floppy"
+# all block devices on these buses are "removable"
+SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy"
 
 # IDE devices
 KERNEL=="hd[a-z]|pcd[0-9]*",                   DRIVERS=="ide-cdrom|pcd", \
@@ -21,11 +25,14 @@ KERNEL=="ht[0-9]*",                                 GROUP="tape"
 KERNEL=="nht[0-9]*",                           GROUP="tape"
 
 # SCSI devices
+KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode"
 SUBSYSTEMS=="scsi", ATTRS{type}=="1",                          GROUP="tape"
 SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="HP",     GROUP="scanner"
 SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson",  GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON",  GROUP="scanner"
 SUBSYSTEMS=="scsi", ATTRS{type}=="5",                          GROUP="cdrom"
 SUBSYSTEMS=="scsi", ATTRS{type}=="6",                          GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="8",                          GROUP="tape"
 
 # USB devices
 KERNEL=="legousbtower*",       MODE="0666"
@@ -73,10 +80,12 @@ KERNEL=="sgi_fetchop",              MODE="0666"
 KERNEL=="sonypi",              MODE="0666"
 KERNEL=="agpgart",                             GROUP="video"
 KERNEL=="nvram",                               GROUP="nvram"
-KERNEL=="rtc",                                 GROUP="audio"
+KERNEL=="rtc|rtc[0-9]*",                       GROUP="audio"
 KERNEL=="tpm*",                        MODE="0600",    OWNER="tss", GROUP="tss"
 KERNEL=="fuse",                                        GROUP="fuse"
 KERNEL=="kqemu",               MODE="0666"
+KERNEL=="kvm",                                 GROUP="kvm"
+KERNEL=="tun",                 MODE="0666"
 
 KERNEL=="cdemu[0-9]*",                         GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*",                       GROUP="cdrom"
@@ -104,6 +113,7 @@ KERNEL=="video1394*",                               GROUP="video"
 KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \
                                MODE="0664",    GROUP="video"
 KERNEL=="js[0-9]*",            MODE="0664"
+KERNEL=="lirc[0-9]*",                          GROUP="video"
 
 # AOE character devices
 SUBSYSTEM=="aoe",              MODE="0220",    GROUP="disk"