[libvirt] [dbus PATCH 0/2] Fix polkit rules directory
See patch 2/2 for the details. Andrea Bolognani (2): configure: Make polkit rules directory configurable configure: Fix default polkit rules directory configure.ac | 5 +++++ data/Makefile.am | 2 +- libvirt-dbus.spec.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) -- 2.17.1
This is consistent with how we treat other directories where we install data files. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- configure.ac | 5 +++++ data/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a52a108..af96b97 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,11 @@ LIBVIRT_ARG_WITH([DBUS_INTERFACES], [where D-Bus interfaces directory is], DBUS_INTERFACES_DIR="$with_dbus_interfaces" AC_SUBST([DBUS_INTERFACES_DIR]) +LIBVIRT_ARG_WITH([POLKIT_RULES], [directory for polkit rules], + ['$(sysconfdir)/polkit-1/rules.d']) +POLKIT_RULES_DIR="$with_polkit_rules" +AC_SUBST(POLKIT_RULES_DIR) + LIBVIRT_ARG_WITH([SYSTEM_USER], [username to run system instance as], ['libvirtdbus']) SYSTEM_USER=$with_system_user diff --git a/data/Makefile.am b/data/Makefile.am index b0e6b31..8c5a8d2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -15,7 +15,7 @@ system_policy_DATA = $(system_policy_files:.conf.in=.conf) polkit_files = \ system/libvirt-dbus.rules.in -polkitdir = $(sysconfdir)/polkit-1/rules.d +polkitdir = $(POLKIT_RULES_DIR) polkit_DATA = $(polkit_files:.rules.in=.rules) interfaces_files = \ -- 2.17.1
The polkit hierarchy under $(sysconfdir) is intended as a way for the local administrator to agument or override the vendor configuration, so we should install our rules under $(datadir) instead. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- configure.ac | 2 +- libvirt-dbus.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index af96b97..1a0a457 100644 --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,7 @@ DBUS_INTERFACES_DIR="$with_dbus_interfaces" AC_SUBST([DBUS_INTERFACES_DIR]) LIBVIRT_ARG_WITH([POLKIT_RULES], [directory for polkit rules], - ['$(sysconfdir)/polkit-1/rules.d']) + ['$(datadir)/polkit-1/rules.d']) POLKIT_RULES_DIR="$with_polkit_rules" AC_SUBST(POLKIT_RULES_DIR) diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in index db58483..319fd59 100644 --- a/libvirt-dbus.spec.in +++ b/libvirt-dbus.spec.in @@ -50,12 +50,12 @@ exit 0 %files %doc README.md HACKING.md AUTHORS NEWS %license COPYING -%{_sysconfdir}/polkit-1/rules.d/libvirt-dbus.rules %{_bindir}/libvirt-dbus %{_datadir}/dbus-1/services/org.libvirt.service %{_datadir}/dbus-1/system-services/org.libvirt.service %{_datadir}/dbus-1/system.d/org.libvirt.conf %{_datadir}/dbus-1/interfaces/org.libvirt.*.xml +%{_datadir}/polkit-1/rules.d/libvirt-dbus.rules %{_mandir}/man8/libvirt-dbus.8* %changelog -- 2.17.1
participants (2)
-
Andrea Bolognani -
Pavel Hrdina