Rename the general-purpose udev rule (i.e. the one granting access
to all users instead of only users of a specific group) and modify
the documentation accordingly.
This completes the fix for bug #1329.
Signed-off-by: Guido Trentalancia <gu...@trentalancia.com>
---
Makefile.am | 2 +-
README.devices | 9 ++++-----
contrib/61-libsigrok.rules | 13 +++++--------
3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0446be1..8d904f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -662,7 +662,7 @@ EXTRA_DIST = \
contrib/vnd.sigrok.session.xml \
contrib/60-libsigrok.rules \
contrib/61-libsigrok-plugdev.rules \
- contrib/61-libsigrok-uaccess.rules
+ contrib/61-libsigrok.rules
if HAVE_CHECK
TESTS = tests/main
diff --git a/README.devices b/README.devices
index 795ebc1..a8ec45a 100644
--- a/README.devices
+++ b/README.devices
@@ -245,14 +245,13 @@ range of devices, e.g. GPS receivers, which are not
handled by libsigrok).
The file is available in contrib/60-libsigrok.rules. This file just contains
the list of devices and flags these devices with ID_SIGROK="1". Access is
-granted by the 61-libsigrok-plugdev.rules or 61-libsigrok-uaccess.rules files,
-allowing access to members of the plugdev group or to currently logged in
-users, respectively.
+granted by the 61-libsigrok-plugdev.rules or 61-libsigrok.rules files,
+allowing access to members of the plugdev group or to all users, respectively.
When using a libsigrok package from your favorite Linux distribution, the
files should already be installed in /usr/lib/udev/rules.d/, i.e.
-60-libsigrok.rules and one of the access granting rules files. Use of
-61-libsigrok-uaccess.rules is encouraged on systemd distributions.
+60-libsigrok.rules and one of the two access granting rules files ("plugdev"
+group based or all users).
The access policy can be locally overridden by placing appropriate rules in
/etc/udev/rules.d/, disabling or ammending the default policy. See the
diff --git a/contrib/61-libsigrok-uaccess.rules b/contrib/61-libsigrok.rules
similarity index 65%
rename from contrib/61-libsigrok-uaccess.rules
rename to contrib/61-libsigrok.rules
index 7fb80fb..9ff036a 100644
--- a/contrib/61-libsigrok-uaccess.rules
+++ b/contrib/61-libsigrok.rules
@@ -1,7 +1,7 @@
##
## This file is part of the libsigrok project.
##
-## Copyright (C) 2017 Stefan Bruens <stefan.bru...@rwth-aachen.de>
+## Copyright (C) 2018 Guido Trentalancia <gu...@trentalancia.com>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -17,16 +17,13 @@
## along with this program; if not, see <http://www.gnu.org/licenses/>.
##
-# Grant access permissions to users who are currently logged in locally.
-# This is the default policy for systems using systemd-logind (or a
-# compatible replacement).
+# Grant access permissions to all users.
#
# This file, when installed, must be installed with a name lexicographically
-# sorted later than the accompanied 60-libsigrok.rules, and earlier than
-# the systemd upstream 71-seat.rules.
+# sorted later than the accompanied 60-libsigrok.rules.
-ACTION!="add|change", GOTO="libsigrok_rules_uaccess_end"
+ACTION!="add|change", GOTO="libsigrok_rules_end"
ENV{ID_SIGROK}=="1", MODE="0666"
-LABEL="libsigrok_rules_uaccess_end"
+LABEL="libsigrok_rules_end"
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
