summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2013-11-20 18:20:01 -0500
committerColin Walters <walters@verbum.org>2013-11-20 18:20:01 -0500
commitcefd910bcaad2df5d6c74407f1391172911527d3 (patch)
tree80d446d0f10d53fe678d8f156ecb37fc457bcc76
parent7c323e893744ae9671996099dfdda02e4410dc65 (diff)
downloadgnome-settings-daemon-cefd910bcaad2df5d6c74407f1391172911527d3.tar.gz
rfkill: Pull 61-gnome-bluetooth-rfkill.rules here to upstream
It lives in the Debian and Fedora packages at least, and I stopped digging through downstream package crap after that. From the mailing list discussion, yeah, while Marcel has a point, in practice, console users can shut down the machine too... And many downstreams ship NetworkManager with permissions such that the user can control system networking to a large degree. Given that, let's just pull this upstream, anyone who doesn't want it can work on engineering something else (which is likely making NetworkManager be a proxy). The *real* reason I'm doing this is because it avoids librfkill-glib as used by gnome-shell spewing a g_warning() on start. https://bugzilla.gnome.org/show_bug.cgi?id=711373
-rw-r--r--plugins/rfkill/61-gnome-settings-daemon-rfkill.rules8
-rw-r--r--plugins/rfkill/Makefile.am3
2 files changed, 11 insertions, 0 deletions
diff --git a/plugins/rfkill/61-gnome-settings-daemon-rfkill.rules b/plugins/rfkill/61-gnome-settings-daemon-rfkill.rules
new file mode 100644
index 00000000..87eabff2
--- /dev/null
+++ b/plugins/rfkill/61-gnome-settings-daemon-rfkill.rules
@@ -0,0 +1,8 @@
+# Get access to /dev/rfkill for users
+# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
+#
+# Simplified by Kay Sievers
+# https://bugzilla.redhat.com/show_bug.cgi?id=733326
+# See also https://bugzilla.gnome.org/show_bug.cgi?id=711373
+
+KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess"
diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
index 0d5cc2d3..cc8e4ae2 100644
--- a/plugins/rfkill/Makefile.am
+++ b/plugins/rfkill/Makefile.am
@@ -59,6 +59,9 @@ plugin_in_files = rfkill.gnome-settings-plugin.in
plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+udevrulesdir = $(prefix)/lib/udev/rules.d
+udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
+
EXTRA_DIST = $(plugin_in_files)
CLEANFILES = $(plugin_DATA)
DISTCLEANFILES = $(plugin_DATA)