From nobody Wed May 14 18:35:45 2025 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 1519227361470913.2705251030085; Wed, 21 Feb 2018 07:36:01 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A909B6E764; Wed, 21 Feb 2018 15:35:59 +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 74F795D98E; Wed, 21 Feb 2018 15:35:59 +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 3C00B4A47D; Wed, 21 Feb 2018 15:35:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1LFZeew021000 for ; Wed, 21 Feb 2018 10:35:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id ABAFD10A9713; Wed, 21 Feb 2018 15:35:40 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 112F710A9711; Wed, 21 Feb 2018 15:35:39 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 21 Feb 2018 15:35:24 +0000 Message-Id: <20180221153525.14973-10-berrange@redhat.com> In-Reply-To: <20180221153525.14973-1-berrange@redhat.com> References: <20180221153525.14973-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/10] daemon: move misc libvirtd policy files to src/remote/ 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: , Content-Type: text/plain; charset="utf-8" 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 21 Feb 2018 15:36:00 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- daemon/Makefile.am | 87 ++-----------------= -- src/Makefile.am | 92 +++++++++++++++++++= +++- {daemon =3D> src/remote}/libvirtd.policy.in | 0 daemon/libvirt.rules =3D> src/remote/libvirtd.rules | 0 {daemon =3D> src/remote}/libvirtd.sasl | 0 {daemon =3D> src/remote}/libvirtd.sysctl | 0 6 files changed, 94 insertions(+), 85 deletions(-) rename {daemon =3D> src/remote}/libvirtd.policy.in (100%) rename daemon/libvirt.rules =3D> src/remote/libvirtd.rules (100%) rename {daemon =3D> src/remote}/libvirtd.sasl (100%) rename {daemon =3D> src/remote}/libvirtd.sysctl (100%) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 8bac9a550b..ab7faf3e66 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -20,10 +20,6 @@ CLEANFILES =3D =20 DISTCLEANFILES =3D EXTRA_DIST =3D \ - libvirtd.policy.in \ - libvirt.rules \ - libvirtd.sasl \ - libvirtd.sysctl \ libvirtd.logrotate.in \ libvirtd.qemu.logrotate.in \ libvirtd.lxc.logrotate.in \ @@ -36,59 +32,18 @@ BUILT_SOURCES =3D =20 if WITH_LIBVIRTD =20 -if WITH_POLKIT -if WITH_POLKIT0 -policydir =3D $(datadir)/PolicyKit/policy -policyauth =3D auth_admin_keep_session -else ! WITH_POLKIT0 -policydir =3D $(datadir)/polkit-1/actions -policyauth =3D auth_admin_keep -rulesdir =3D $(datadir)/polkit-1/rules.d -rulesfile =3D libvirt.rules -endif ! WITH_POLKIT0 -endif WITH_POLKIT - -libvirtd.policy: libvirtd.policy.in $(top_builddir)/config.status - $(AM_V_GEN) sed \ - -e 's|[@]authaction[@]|$(policyauth)|g' \ - < $< > $@-t && \ - mv $@-t $@ -BUILT_SOURCES +=3D libvirtd.policy =20 -install-data-local: install-data-sasl install-data-polkit \ - install-logrotate install-sysctl + +install-data-local: install-logrotate $(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt \ $(DESTDIR)$(localstatedir)/run/libvirt \ $(DESTDIR)$(localstatedir)/lib/libvirt =20 -uninstall-local:: uninstall-data-sasl uninstall-data-polkit \ - uninstall-logrotate uninstall-sysctl +uninstall-local:: uninstall-logrotate rmdir $(DESTDIR)$(localstatedir)/log/libvirt || : rmdir $(DESTDIR)$(localstatedir)/run/libvirt || : rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || : =20 -if WITH_POLKIT -install-data-polkit:: - $(MKDIR_P) $(DESTDIR)$(policydir) - $(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.p= olicy -if ! WITH_POLKIT0 - $(MKDIR_P) $(DESTDIR)$(rulesdir) - $(INSTALL_DATA) $(srcdir)/$(rulesfile) $(DESTDIR)$(rulesdir)/50-libvirt.r= ules -endif ! WITH_POLKIT0 - -uninstall-data-polkit:: - rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy - rmdir $(DESTDIR)$(policydir) || : -if ! WITH_POLKIT0 - rm -f $(DESTDIR)$(rulesdir)/50-libvirt.rules - rmdir $(DESTDIR)$(rulesdir) || : -endif ! WITH_POLKIT0 - -else ! WITH_POLKIT -install-data-polkit:: -uninstall-data-polkit:: -endif ! WITH_POLKIT - LOGROTATE_CONFS =3D libvirtd.qemu.logrotate libvirtd.lxc.logrotate \ libvirtd.libxl.logrotate libvirtd.uml.logrotate \ libvirtd.logrotate @@ -152,43 +107,11 @@ uninstall-logrotate: rmdir $(DESTDIR)$(localstatedir)/log/libvirt/uml || : rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : =20 -if WITH_SYSCTL -# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on -# /usr/lib/sysctl.d/ even when libdir is /usr/lib64 -install-sysctl: - $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d - $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \ - $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf - -uninstall-sysctl: - rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf - rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || : -else ! WITH_SYSCTL -install-sysctl: -uninstall-sysctl: -endif ! WITH_SYSCTL - else ! WITH_LIBVIRTD -install-data-local: install-data-sasl -uninstall-local:: uninstall-data-sasl +install-data-local: +uninstall-local:: endif ! WITH_LIBVIRTD =20 -# This is needed for clients too, so can't wrap in -# the WITH_LIBVIRTD conditional -if WITH_SASL -install-data-sasl: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/ - $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \ - $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf - -uninstall-data-sasl: - rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf - rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || : -else ! WITH_SASL -install-data-sasl: -uninstall-data-sasl: -endif ! WITH_SASL - =20 CLEANFILES +=3D $(BUILT_SOURCES) CLEANFILES +=3D *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda diff --git a/src/Makefile.am b/src/Makefile.am index e777fcce09..e1a883fa84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1378,6 +1378,24 @@ conf_DATA +=3D remote/libvirtd.conf =20 CLEANFILES +=3D tets_libvirtd.aug =20 +if WITH_POLKIT +if WITH_POLKIT0 +policydir =3D $(datadir)/PolicyKit/policy +policyauth =3D auth_admin_keep_session +else ! WITH_POLKIT0 +policydir =3D $(datadir)/polkit-1/actions +policyauth =3D auth_admin_keep +endif ! WITH_POLKIT0 +endif WITH_POLKIT + +BUILT_SOURCES +=3D libvirtd.policy + +libvirtd.policy: remote/libvirtd.policy.in $(top_builddir)/config.status + $(AM_V_GEN) sed \ + -e 's|[@]authaction[@]|$(policyauth)|g' \ + < $< > $@-t && \ + mv $@-t $@ + libvirtd_SOURCES =3D $(LIBVIRTD_SOURCES) =20 libvirtd_CFLAGS =3D \ @@ -1419,7 +1437,15 @@ libvirtd_LDADD +=3D \ $(NULL) =20 endif WITH_LIBVIRTD -EXTRA_DIST +=3D remote/test_libvirtd.aug.in remote/libvirtd.aug remote/lib= virtd.conf +EXTRA_DIST +=3D \ + remote/test_libvirtd.aug.in \ + remote/libvirtd.aug \ + remote/libvirtd.conf \ + remote/libvirtd.policy.in \ + remote/libvirtd.rules \ + remote/libvirtd.sasl \ + remote/libvirtd.sysctl \ + $(NULL) =20 %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ @@ -2826,6 +2852,45 @@ SYSVINIT_FILES =3D $(notdir $(SYSVINIT_FILES_IN:%.in= =3D%)) EXTRA_DIST +=3D $(SYSVINIT_FILES_IN) =20 if WITH_LIBVIRTD + +if WITH_SYSCTL +# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on +# /usr/lib/sysctl.d/ even when libdir is /usr/lib64 +install-sysctl: + $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d + $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \ + $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf + +uninstall-sysctl: + rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf + rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || : +else ! WITH_SYSCTL +install-sysctl: +uninstall-sysctl: +endif ! WITH_SYSCTL + +if WITH_POLKIT +install-polkit:: + $(MKDIR_P) $(DESTDIR)$(policydir) + $(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.p= olicy +if ! WITH_POLKIT0 + $(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d + $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules $(DESTDIR)$(datadir)/polk= it-1/rules.d/50-libvirt.rules +endif ! WITH_POLKIT0 + +uninstall-polkit:: + rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy + rmdir $(DESTDIR)$(policydir) || : +if ! WITH_POLKIT0 + rm -f $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules + rmdir $(DESTDIR)$(datadir)/polkit-1/rules.d || : +endif ! WITH_POLKIT0 + +else ! WITH_POLKIT +install-polkit:: +uninstall-polkit:: +endif ! WITH_POLKIT + if LIBVIRT_INIT_SCRIPT_RED_HAT install-init:: $(SYSVINIT_FILES) install-sysconfig $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d @@ -2845,10 +2910,31 @@ install-init:: uninstall-init:: endif ! LIBVIRT_INIT_SCRIPT_RED_HAT else ! WITH_LIBVIRTD +install-polkit:: +uninstall-polkit:: +install-sysctl:: +uninstall-sysctl:: install-init:: uninstall-init:: endif ! WITH_LIBVIRTD =20 +# This is needed for clients too, so can't wrap in +# the WITH_LIBVIRTD conditional +if WITH_SASL +install-sasl: + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/ + $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \ + $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf + +uninstall-sasl: + rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf + rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || : +else ! WITH_SASL +install-sasl: +uninstall-sasl: +endif ! WITH_SASL + + libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ @@ -3440,7 +3526,7 @@ libvirt_nss_la_LIBADD =3D \ endif WITH_NSS =20 =20 -install-data-local: install-init install-systemd install-upstart +install-data-local: install-init install-systemd install-upstart install-s= ysctl install-polkit install-sasl if WITH_LIBVIRTD $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" @@ -3495,7 +3581,7 @@ if WITH_NETWORK $(LN_S) ../default.xml default.xml ) endif WITH_NETWORK =20 -uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart +uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart unins= tall-sysctl uninstall-polkit uninstall-sasl if WITH_LIBVIRTD rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||: diff --git a/daemon/libvirtd.policy.in b/src/remote/libvirtd.policy.in similarity index 100% rename from daemon/libvirtd.policy.in rename to src/remote/libvirtd.policy.in diff --git a/daemon/libvirt.rules b/src/remote/libvirtd.rules similarity index 100% rename from daemon/libvirt.rules rename to src/remote/libvirtd.rules diff --git a/daemon/libvirtd.sasl b/src/remote/libvirtd.sasl similarity index 100% rename from daemon/libvirtd.sasl rename to src/remote/libvirtd.sasl diff --git a/daemon/libvirtd.sysctl b/src/remote/libvirtd.sysctl similarity index 100% rename from daemon/libvirtd.sysctl rename to src/remote/libvirtd.sysctl --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list