summaryrefslogtreecommitdiffstats
path: root/udev-acl
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-05 03:00:21 +0100
committerKay Sievers <kay.sievers@vrfy.org>2009-01-05 03:00:21 +0100
commit8dd90d6d7a62869506d8dc15784bab14c6aa16ae (patch)
tree8c5c225753f248d37bdb00f87d3e3aca14836742 /udev-acl
parent2f3b4efc7b88b08cfacfb1ec1f0eaa853b070ac8 (diff)
udev-acl: add WAIT_FOR_SYSFS until the USB is fix merged
Diffstat (limited to 'udev-acl')
-rw-r--r--udev-acl/70-acl.rules9
1 files changed, 8 insertions, 1 deletions
diff --git a/udev-acl/70-acl.rules b/udev-acl/70-acl.rules
index 1deb1ae..c73ae90 100644
--- a/udev-acl/70-acl.rules
+++ b/udev-acl/70-acl.rules
@@ -8,9 +8,14 @@
# ACL_MEDIA
# ACL_AUTH
+ACTION!="add|change", GOTO="acl_end"
+
+# will be removed when 2.6.29 is out
+SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="", ENV{DEVTYPE}=="usb_device", WAIT_FOR_SYSFS="descriptors"
+
# match PTP protocol devices
SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="", ENV{DEVTYPE}=="usb_device", IMPORT{program}="usbdev_id %p"
-SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101*", ENV{ACL_PHOTO}="1"
+SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", ENV{ACL_PHOTO}="1"
# SCSI scanners
KERNEL=="sg[0-9]*", ATTRS{type}=="3|6", ENV{ACL_SCANNER}="1"
@@ -29,3 +34,5 @@ SUBSYSTEM=="video4linux", ENV{ACL_VIDEO}="1"
# fingerprint readers
SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="2016", ENV{ACL_AUTH}="1"
+
+LABEL="acl_end"