X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=extras%2Fudev-acl%2F70-acl.rules;h=5dc5ed0bfc0e1ee865a8d942dbcad98e451e5cdf;hb=f2a2983604fa6876fc297c9156b7ad0f04a482e8;hp=c7134bc5bd53f30904f3117ea4cfa35587b77bdb;hpb=3bd7b89dc40c4a0440ee5fce2ea907971bfcfb10;p=elogind.git

diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules
index c7134bc5b..5dc5ed0bf 100644
--- a/extras/udev-acl/70-acl.rules
+++ b/extras/udev-acl/70-acl.rules
@@ -7,7 +7,6 @@ ENV{MAJOR}=="", GOTO="acl_end"
 ACTION=="remove", GOTO="acl_apply"
 
 # PTP/MTP protocol devices, cameras, portable media players
-SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="", ENV{DEVTYPE}=="usb_device", IMPORT{program}="usb_id --export %p"
 SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", TAG+="udev-acl"
 
 # digicams with proprietary protocol
@@ -21,11 +20,13 @@ ENV{ID_HPLIP}=="1", TAG+="udev-acl"
 
 # optical drives
 SUBSYSTEM=="block", ENV{ID_CDROM}=="1", TAG+="udev-acl"
+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", TAG+="udev-acl"
 
 # sound devices
 SUBSYSTEM=="sound", TAG+="udev-acl"
-# sound jack-sense
-SUBSYSTEM=="input", SUBSYSTEMS=="sound", TAG+="udev-acl"
+
+# ffado is an userspace driver for firewire sound cards
+SUBSYSTEM=="firewire", ENV{ID_FFADO}=="1", TAG+="udev-acl"
 
 # webcams, frame grabber, TV cards
 SUBSYSTEM=="video4linux", TAG+="udev-acl"
@@ -47,6 +48,12 @@ SUBSYSTEM=="misc", KERNEL=="kvm", TAG+="udev-acl"
 # smart-card readers
 ENV{ID_SMARTCARD_READER}=="*?", TAG+="udev-acl"
 
+# PDA devices
+ENV{ID_PDA}=="*?", TAG+="udev-acl"
+
+# Programmable remote control
+ENV{ID_REMOTE_CONTROL}=="1", TAG+="udev-acl"
+
 # joysticks
 SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="udev-acl"
 
@@ -56,6 +63,9 @@ ENV{COLOR_MEASUREMENT_DEVICE}=="*?", TAG+="udev-acl"
 # DDC/CI device, usually high-end monitors such as the DreamColor
 ENV{DDC_DEVICE}=="*?", TAG+="udev-acl"
 
+# media player raw devices (for user-mode drivers, Android SDK, etc.)
+SUBSYSTEM=="usb", ENV{ID_MEDIA_PLAYER}=="?*", TAG+="udev-acl"
+
 # apply ACL for all locally logged in users
 LABEL="acl_apply", TAG=="udev-acl", TEST=="/var/run/ConsoleKit/database", \
   RUN+="udev-acl --action=$env{ACTION} --device=$env{DEVNAME}"