summaryrefslogtreecommitdiffstats
path: root/udev-acl/70-acl.rules
diff options
context:
space:
mode:
Diffstat (limited to 'udev-acl/70-acl.rules')
-rw-r--r--udev-acl/70-acl.rules36
1 files changed, 15 insertions, 21 deletions
diff --git a/udev-acl/70-acl.rules b/udev-acl/70-acl.rules
index 6771b0e..708198a 100644
--- a/udev-acl/70-acl.rules
+++ b/udev-acl/70-acl.rules
@@ -1,40 +1,34 @@
# do not edit this file, it will be overwritten on update
-# support for the following ACL "tags" get merged
-# ACL_CDROM
-# ACL_SCANNER
-# ACL_AUDIO
-# ACL_VIDEO
-# 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"
+ENV{MAJOR}=="", GOTO="acl_end"
+ACTION!="add|change", 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:*", ENV{ACL_MEDIA}="1"
+SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", ENV{ACL_SET}="1"
# SCSI scanners
-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"
+KERNEL=="sg[0-9]*", ATTRS{type}=="6", ENV{ACL_SET}="1"
+KERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="HP|EPSON|Epson", ENV{ACL_SET}="1"
# USB scanners
-ENV{libsane_matched}=="yes", ENV{ACL_SCANNER}="1"
+ENV{libsane_matched}=="yes", ENV{ACL_SET}="1"
# optical drives
-SUBSYSTEM=="block", ENV{ID_CDROM}=="1", ENV{ACL_CDROM}="1"
+SUBSYSTEM=="block", ENV{ID_CDROM}=="1", ENV{ACL_SET}="1"
# sound devices
-SUBSYSTEM=="sound", ENV{ACL_AUDIO}="1"
+SUBSYSTEM=="sound", ENV{ACL_SET}="1"
# webcams, frame grabber, TV cards
-SUBSYSTEM=="video4linux", ENV{ACL_VIDEO}="1"
-SUBSYSTEM=="dvb", ENV{ACL_VIDEO}="1"
+SUBSYSTEM=="video4linux", ENV{ACL_SET}="1"
+SUBSYSTEM=="dvb", ENV{ACL_SET}="1"
# fingerprint readers
-SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="2016", ENV{ACL_AUTH}="1"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="2016", ENV{ACL_SET}="1"
+
+# apply ACL for all locally logged in users
+LABEL="acl_apply", ENV{ACL_SET}=="?*", TEST=="/var/run/ConsoleKit/database", \
+ RUN+="udev-acl --action=$env{ACTION} --device=$env{DEVNAME}"
LABEL="acl_end"