rules: Debian update

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

diff --git a/etc/udev/debian/permissions.rules b/etc/udev/debian/permissions.rules
index ac6c0be38be8dd0a9c4694b043c2f45b61d5ae87..205b7332920bcb413bb6d3e3403462eccc865da7 100644 (file)
--- a/etc/udev/debian/permissions.rules
+++ b/etc/udev/debian/permissions.rules
@@ -3,12 +3,17 @@ ACTION!="add", GOTO="permissions_end"
 # workarounds needed to synchronize with sysfs
 # only needed for kernels < v2.6.18-rc1
 ENV{PHYSDEVPATH}!="?*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-SUBSYSTEM=="scsi",                             WAIT_FOR_SYSFS="ioerr_cnt"
+SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*",    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{DRIVER}=="?*",           WAIT_FOR_SYSFS="device/driver"
 
+# devices needed to load the drivers providing them
+KERNEL=="tun",                                 OPTIONS+="ignore_remove"
+KERNEL=="ppp",                                 OPTIONS+="ignore_remove"
+KERNEL=="loop[0-9]*",                          OPTIONS+="ignore_remove"
+
 # default permissions for block devices
 SUBSYSTEM=="block",                            GROUP="disk"
 # the aacraid driver is broken and reports that disks removable (see #404927)
@@ -30,6 +35,7 @@ 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}=="4",                          GROUP="cdrom"
 SUBSYSTEMS=="scsi", ATTRS{type}=="5",                          GROUP="cdrom"
 SUBSYSTEMS=="scsi", ATTRS{type}=="6",                          GROUP="scanner"
 SUBSYSTEMS=="scsi", ATTRS{type}=="8",                          GROUP="tape"
@@ -39,10 +45,11 @@ KERNEL=="legousbtower*",    MODE="0666"
 KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb",         GROUP="lp"
 
 # usbfs-like devices
-SUBSYSTEM=="usb_device",       MODE="0664"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \
+                               MODE="0664"
 
 # iRiver music players
-SUBSYSTEM=="usb_device",                       GROUP="plugdev", \
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",  GROUP="plugdev", \
        ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]"
 
 # serial devices
@@ -85,7 +92,7 @@ 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=="tun",                 MODE="0666",
 
 KERNEL=="cdemu[0-9]*",                         GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*",                       GROUP="cdrom"
@@ -93,6 +100,7 @@ KERNEL=="pktcdvd",           MODE="0644"
 
 KERNEL=="uverbs*",                             GROUP="rdma"
 KERNEL=="ucm*",                                        GROUP="rdma"
+KERNEL=="rdma_ucm",                            GROUP="rdma"
 
 # printers and parallel devices
 SUBSYSTEM=="printer",                          GROUP="lp"