From nobody Fri May 10 00:44:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1530263236030205.2326866613363; Fri, 29 Jun 2018 02:07:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6472981123; Fri, 29 Jun 2018 09:07:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2459C2007FE1; Fri, 29 Jun 2018 09:07:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8E2FA4A460; Fri, 29 Jun 2018 09:07:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5T979X2007201 for ; Fri, 29 Jun 2018 05:07:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 48BE92026D6C; Fri, 29 Jun 2018 09:07:09 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E09052026D68 for ; Fri, 29 Jun 2018 09:07:08 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 29 Jun 2018 11:07:03 +0200 Message-Id: <20180629090704.5386-2-abologna@redhat.com> In-Reply-To: <20180629090704.5386-1-abologna@redhat.com> References: <20180629090704.5386-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 1/2] configure: Make polkit rules directory configurable X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 29 Jun 2018 09:07:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is consistent with how we treat other directories where we install data files. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- 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 interfa= ces directory is], DBUS_INTERFACES_DIR=3D"$with_dbus_interfaces" AC_SUBST([DBUS_INTERFACES_DIR]) =20 +LIBVIRT_ARG_WITH([POLKIT_RULES], [directory for polkit rules], + ['$(sysconfdir)/polkit-1/rules.d']) +POLKIT_RULES_DIR=3D"$with_polkit_rules" +AC_SUBST(POLKIT_RULES_DIR) + LIBVIRT_ARG_WITH([SYSTEM_USER], [username to run system instance as], ['libvirtdbus']) SYSTEM_USER=3D$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 =3D $(system_policy_files:.conf.in=3D.= conf) =20 polkit_files =3D \ system/libvirt-dbus.rules.in -polkitdir =3D $(sysconfdir)/polkit-1/rules.d +polkitdir =3D $(POLKIT_RULES_DIR) polkit_DATA =3D $(polkit_files:.rules.in=3D.rules) =20 interfaces_files =3D \ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 10 00:44:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1530263245286424.01406778574597; Fri, 29 Jun 2018 02:07:25 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 83FA4369D2; Fri, 29 Jun 2018 09:07:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3BF698958D; Fri, 29 Jun 2018 09:07:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id AF5704A460; Fri, 29 Jun 2018 09:07:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5T97A59007214 for ; Fri, 29 Jun 2018 05:07:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id E22762026D6C; Fri, 29 Jun 2018 09:07:09 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 868F42026D68 for ; Fri, 29 Jun 2018 09:07:09 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 29 Jun 2018 11:07:04 +0200 Message-Id: <20180629090704.5386-3-abologna@redhat.com> In-Reply-To: <20180629090704.5386-1-abologna@redhat.com> References: <20180629090704.5386-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 2/2] configure: Fix default polkit rules directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 29 Jun 2018 09:07:24 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Pavel Hrdina --- 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=3D"$with_dbus_interfaces" AC_SUBST([DBUS_INTERFACES_DIR]) =20 LIBVIRT_ARG_WITH([POLKIT_RULES], [directory for polkit rules], - ['$(sysconfdir)/polkit-1/rules.d']) + ['$(datadir)/polkit-1/rules.d']) POLKIT_RULES_DIR=3D"$with_polkit_rules" AC_SUBST(POLKIT_RULES_DIR) =20 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* =20 %changelog --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list