Do not generate polkit rules file

This essentially reverts commit <e1019e9>, which added
an extra step for generating the policy file.

Signed-off-by: Ján Tomko <jtomko@redhat.com>

diff --git a/.gitignore b/.gitignore
index 2ca7d9776e2e66c929cd98f60a49dfdc4b480d8b..dd00fc5ccf8a0e91e96cd5ada8256e04007a3fde 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -135,7 +135,6 @@
 /src/libvirt_lxc
 /src/libvirtd
 /src/libvirtd*.logrotate
-/src/libvirtd.policy
 /src/locking/libxl-lockd.conf
 /src/locking/libxl-sanlock.conf
 /src/locking/lock_daemon_dispatch_stubs.h

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 2fb6056fcc0a5a34d9903adc9d3b54a2e0391bbc..12600b8bb5cc2c55d1fdba4a30ded98765b56c60 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -75,7 +75,7 @@ EXTRA_DIST += \
        remote/test_libvirtd.aug.in \
        remote/libvirtd.aug \
        remote/libvirtd.conf \
-       remote/libvirtd.policy.in \
+       remote/libvirtd.policy \
        remote/libvirtd.rules \
        remote/libvirtd.sasl \
        remote/libvirtd.sysctl \
@@ -121,12 +121,8 @@ CLEANFILES += test_libvirtd.aug
 
 if WITH_POLKIT
 policydir = $(datadir)/polkit-1/actions
-policyauth = auth_admin_keep
 endif WITH_POLKIT
 
-BUILT_SOURCES += libvirtd.policy
-CLEANFILES += libvirtd.policy
-
 man8_MANS += libvirtd.8
 
 libvirtd_SOURCES = $(LIBVIRTD_SOURCES)
@@ -213,7 +209,8 @@ endif ! WITH_SYSCTL
 if WITH_POLKIT
 install-polkit::
        $(MKDIR_P) $(DESTDIR)$(policydir)
-       $(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+       $(INSTALL_DATA) $(srcdir)/remote/libvirtd.policy \
+               $(DESTDIR)$(policydir)/org.libvirt.unix.policy
        $(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d
        $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \
                $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
@@ -258,12 +255,6 @@ install-sasl:
 uninstall-sasl:
 endif ! WITH_SASL
 
-libvirtd.policy: remote/libvirtd.policy.in $(top_builddir)/config.status
-       $(AM_V_GEN) sed \
-           -e 's|[@]authaction[@]|$(policyauth)|g' \
-           < $< > $@-t && \
-       mv $@-t $@
-
 libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status
        $(AM_V_GEN)sed \
            -e 's|[@]localstatedir[@]|$(localstatedir)|g' \

diff --git a/src/remote/libvirtd.policy b/src/remote/libvirtd.policy
new file mode 100644 (file)
index 0000000..e834d24
--- /dev/null
+++ b/src/remote/libvirtd.policy
@@ -0,0 +1,51 @@
+<?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">
+
+<!--
+Policy definitions for libvirt daemon
+
+Copyright (C) 2012 Red Hat, Inc.
+Copyright (C) 2007 Daniel P. Berrange <berrange redhat com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library.  If not, see
+<http://www.gnu.org/licenses/>.
+-->
+
+<policyconfig>
+    <action id="org.libvirt.unix.monitor">
+      <description>Monitor local virtualized systems</description>
+      <message>System policy prevents monitoring of local virtualized systems</message>
+      <defaults>
+        <!-- Any program can use libvirt in read-only mode for monitoring,
+             even if not part of a session -->
+        <allow_any>yes</allow_any>
+        <allow_inactive>yes</allow_inactive>
+        <allow_active>yes</allow_active>
+      </defaults>
+    </action>
+
+    <action id="org.libvirt.unix.manage">
+      <description>Manage local virtualized systems</description>
+      <message>System policy prevents management of local virtualized systems</message>
+      <defaults>
+        <!-- Any program can use libvirt in read/write mode if they
+             provide the root password -->
+        <allow_any>auth_admin_keep</allow_any>
+        <allow_inactive>auth_admin_keep</allow_inactive>
+        <allow_active>auth_admin_keep</allow_active>
+      </defaults>
+    </action>
+</policyconfig>

diff --git a/src/remote/libvirtd.policy.in b/src/remote/libvirtd.policy.in
deleted file mode 100644 (file)
index de1aba4..0000000
--- a/src/remote/libvirtd.policy.in
+++ /dev/null
@@ -1,51 +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">
-
-<!--
-Policy definitions for libvirt daemon
-
-Copyright (C) 2012 Red Hat, Inc.
-Copyright (C) 2007 Daniel P. Berrange <berrange redhat com>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see
-<http://www.gnu.org/licenses/>.
--->
-
-<policyconfig>
-    <action id="org.libvirt.unix.monitor">
-      <description>Monitor local virtualized systems</description>
-      <message>System policy prevents monitoring of local virtualized systems</message>
-      <defaults>
-        <!-- Any program can use libvirt in read-only mode for monitoring,
-             even if not part of a session -->
-        <allow_any>yes</allow_any>
-        <allow_inactive>yes</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </action>
-
-    <action id="org.libvirt.unix.manage">
-      <description>Manage local virtualized systems</description>
-      <message>System policy prevents management of local virtualized systems</message>
-      <defaults>
-        <!-- Any program can use libvirt in read/write mode if they
-             provide the root password -->
-        <allow_any>@authaction@</allow_any>
-        <allow_inactive>@authaction@</allow_inactive>
-        <allow_active>@authaction@</allow_active>
-      </defaults>
-    </action>
-</policyconfig>