diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-01 14:02:47 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-01 14:02:47 +0200 |
| commit | ebf181ce25f98bfdd5a6beb0327f7cfa10a39ac6 (patch) | |
| tree | 30b4b81d186a06b64cd1ffb51236ec52a8e47e34 /usb/55-Argyll.rules | |
| parent | 22f703cab05b7cd368f4de9e03991b7664dc5022 (diff) | |
| parent | d7f89e6fe63b8697fab5a901cfce457b375638b3 (diff) | |
Merge tag 'upstream/1.5.1'
Upstream version 1.5.1
Diffstat (limited to 'usb/55-Argyll.rules')
| -rw-r--r-- | usb/55-Argyll.rules | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usb/55-Argyll.rules b/usb/55-Argyll.rules index 9e083dc..3da9c69 100644 --- a/usb/55-Argyll.rules +++ b/usb/55-Argyll.rules @@ -77,14 +77,14 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="f8da", ENV{COLOR_MEASUREMENT_DEVICE} ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", ENV{COLOR_MEASUREMENT_DEVICE}="1" -# Let users access these devices -ENV{COLOR_MEASUREMENT_DEVICE}=="*?", TAG+="uaccess" +# Let udev-acl manage these devices, if it's available +TEST=="/var/run/ConsoleKit/database", ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1" # Otherwise, restrict access to members of the plugdev group, # which the user may have to add to the system. -ENV{COLOR_MEASUREMENT_DEVICE}=="*?", MODE="660", GROUP="plugdev" +ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev" # Set ID_VENDOR and ID_MODEL acording to VID and PID -IMPORT{builtin}="hwdb --subsystem=usb" +IMPORT{program}="usb-db %p" LABEL="argyll_rules_end" |