X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fudev-acl%2F70-acl.rules;h=b0015b61d8c6eb2aaf9ee58aa737987a23c26e13;hp=6ec04ee45534a3d65c71a119b87403c50b4342e8;hb=37d3d6abdec495769d4c92f3ba1b4c1b1936a831;hpb=2d57b4f8ec53e834317518bde34cf849dabab8c4

diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules
index 6ec04ee45..b0015b61d 100644
--- a/extras/udev-acl/70-acl.rules
+++ b/extras/udev-acl/70-acl.rules
@@ -13,11 +13,7 @@ SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", TAG+="udev-acl"
 # digicams with proprietary protocol
 ENV{ID_GPHOTO2}=="*?", TAG+="udev-acl"
 
-# SCSI scanners
-KERNEL=="sg[0-9]*", ATTRS{type}=="6", TAG+="udev-acl"
-KERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="HP|EPSON|Epson", TAG+="udev-acl"
-
-# USB scanners
+# SCSI and USB scanners
 ENV{libsane_matched}=="yes", TAG+="udev-acl"
 
 # HPLIP devices (necessary for ink level check and HP tool maintenance)
@@ -28,8 +24,9 @@ SUBSYSTEM=="block", ENV{ID_CDROM}=="1", 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"
@@ -51,6 +48,9 @@ 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"
+
 # joysticks
 SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="udev-acl"
 
@@ -60,6 +60,12 @@ 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"
+
+# /dev/sgX nodes for CD-ROM drives
+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", 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}"