summaryrefslogtreecommitdiffstats
path: root/udev-acl
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-05 03:40:09 +0100
committerKay Sievers <kay.sievers@vrfy.org>2009-01-05 03:40:09 +0100
commit95b96e30f498f44de52baa452089d75e637596c4 (patch)
tree9f66c08e5c8eada4e2d0687ff56ee0971c983eda /udev-acl
parent8dd90d6d7a62869506d8dc15784bab14c6aa16ae (diff)
udev-acl: SCSI scanner, DVB, MTP/PTP is ACL_MEDIA
Diffstat (limited to 'udev-acl')
-rw-r--r--udev-acl/70-acl.rules11
1 files changed, 6 insertions, 5 deletions
diff --git a/udev-acl/70-acl.rules b/udev-acl/70-acl.rules
index c73ae90..45c6338 100644
--- a/udev-acl/70-acl.rules
+++ b/udev-acl/70-acl.rules
@@ -4,7 +4,6 @@
# ACL_CDROM
# ACL_SCANNER
# ACL_AUDIO
-# ACL_PHOTO
# ACL_MEDIA
# ACL_AUTH
@@ -13,12 +12,13 @@ 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
+# PTP/MTP protocol devices, cameras, portable media players
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_MEDIA}="1"
# SCSI scanners
-KERNEL=="sg[0-9]*", ATTRS{type}=="3|6", ENV{ACL_SCANNER}="1"
+KERNEL=="sg[0-9]*", ATTRS{type}=="6", ENV{ACL_SCANNER}="1"
+KERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="HP|EPSON|Epson", ENV{ACL_SCANNER}="1"
# USB scanners
ENV{libsane_matched}=="yes", ENV{ACL_SCANNER}="1"
@@ -29,8 +29,9 @@ SUBSYSTEM=="block", ENV{ID_CDROM}=="1", ENV{ACL_CDROM}="1"
# sound devices
SUBSYSTEM=="sound", ENV{ACL_AUDIO}="1"
-# webcams
+# webcams, frame grabber, TV cards
SUBSYSTEM=="video4linux", ENV{ACL_VIDEO}="1"
+SUBSYSTEM=="dvb", ENV{ACL_VIDEO}="1"
# fingerprint readers
SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="2016", ENV{ACL_AUTH}="1"