Change name of policy configuration file for PolicyKit

diff --git a/.gitignore b/.gitignore
index 76255d3..11710f8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ src/connman.ver
 src/connman.conf
 src/connman.service
 src/*-connman.rules
+plugins/connman.policy
 scripts/connman
 scripts/udhcpc-script
 scripts/dhclient-script

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index de4b58b..fc0d252 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -122,6 +122,11 @@ AM_CFLAGS = @GLIB_CFLAGS@ @GDBUS_CFLAGS@
 
 INCLUDES = -I$(top_builddir)/include
 
-EXTRA_DIST = connman.policy
+EXTRA_DIST = polkit.policy
+
+CLEANFILES = polkit.policy
 
 MAINTAINERCLEANFILES = Makefile.in
+
+connman.policy: polkit.policy
+       cp $< $@

diff --git a/plugins/connman.policy b/plugins/connman.policy
deleted file mode 100644 (file)
index bc36a6d..0000000
--- a/plugins/connman.policy
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<policyconfig>
-
-  <vendor>Connection Manager</vendor>
-  <icon_name>network-wireless</icon_name>
-
-  <action id="org.moblin.connman.modify">
-    <description>Settings configuration</description>
-    <message>Policy prevents modification of settings</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep_always</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.moblin.connman.secret">
-    <description>Secrets configuration</description>
-    <message>Policy prevents modification of secrets</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep_always</allow_active>
-    </defaults>
-  </action>
-
-</policyconfig>

diff --git a/plugins/polkit.policy b/plugins/polkit.policy
new file mode 100644 (file)
index 0000000..bc36a6d
--- /dev/null
+++ b/plugins/polkit.policy
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<policyconfig>
+
+  <vendor>Connection Manager</vendor>
+  <icon_name>network-wireless</icon_name>
+
+  <action id="org.moblin.connman.modify">
+    <description>Settings configuration</description>
+    <message>Policy prevents modification of settings</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin_keep_always</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.moblin.connman.secret">
+    <description>Secrets configuration</description>
+    <message>Policy prevents modification of secrets</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin_keep_always</allow_active>
+    </defaults>
+  </action>
+
+</policyconfig>