X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fudev-acl%2F70-acl.rules;h=8259a7a9362f40dea1ef5b6fa13696a6719e1f5a;hp=26b805565abb9e11ca9d35d08e3eda0fa378b5c3;hb=11a421dab5ab4bf9b40464a64b81c9d5c282f414;hpb=9ab11b6258abe2c9c0420a70e5b21f3f341c82c5

diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules
index 26b805565..8259a7a93 100644
--- a/extras/udev-acl/70-acl.rules
+++ b/extras/udev-acl/70-acl.rules
@@ -1,6 +1,7 @@
 # do not edit this file, it will be overwritten on update
 
 ENV{MAJOR}=="", GOTO="acl_end"
+ENV{ACL_MANAGE}=="0", GOTO="acl_end"
 ACTION!="add|change", GOTO="acl_apply"
 
 # PTP/MTP protocol devices, cameras, portable media players
@@ -41,6 +42,12 @@ SUBSYSTEM=="drm", KERNEL=="card*", ENV{ACL_MANAGE}="1"
 # KVM
 SUBSYSTEM=="misc", KERNEL=="kvm", ENV{ACL_MANAGE}="1"
 
+# smart-card readers
+ENV{ID_SMARTCARD_READER}=="*?", ENV{ACL_MANAGE}="1"
+
+# joysticks
+SUBSYSTEM=="input", ENV{ID_CLASS}=="joystick", ENV{ACL_MANAGE}="1"
+
 # apply ACL for all locally logged in users
 LABEL="acl_apply", ENV{ACL_MANAGE}=="?*", TEST=="/var/run/ConsoleKit/database", \
   RUN+="udev-acl --action=$env{ACTION} --device=$env{DEVNAME}"