From nobody Tue Apr 30 16:45:52 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 1517943442635540.0945488674638; Tue, 6 Feb 2018 10:57:22 -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 84F5C8762C; Tue, 6 Feb 2018 18:57:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4868917C14; Tue, 6 Feb 2018 18:57:21 +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 0E1AA1841C45; Tue, 6 Feb 2018 18:57:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w16IueFI007025 for ; Tue, 6 Feb 2018 13:56:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id C5EA860C89; Tue, 6 Feb 2018 18:56:40 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-116-232.phx2.redhat.com [10.3.116.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82CF9609A5 for ; Tue, 6 Feb 2018 18:56:39 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Tue, 6 Feb 2018 13:56:25 -0500 Message-Id: <20180206185626.7171-2-jferlan@redhat.com> In-Reply-To: <20180206185626.7171-1-jferlan@redhat.com> References: <20180206185626.7171-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] logd: Install the admin sockets 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 06 Feb 2018 18:57:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit id '85d45ff0' added support for the logd admin socket, but forgot to add the socket to the make and spec files for installation purposes. NB: Includes breaking up the long %systemd_ lists across multiple lines for ease of reading Signed-off-by: John Ferlan Reviewed-by: Daniel P. Berrange --- libvirt.spec.in | 16 ++++++++++++---- src/Makefile.am | 20 ++++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1879e1f8b..d94031067 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1520,13 +1520,16 @@ exit 0 =20 %if %{with_systemd} %if %{with_systemd_macros} - %systemd_post virtlockd.socket virtlogd.socket libvirtd.service + %systemd_post virtlockd.socket \ + virtlogd.socket virtlogd-admin.socket \ + libvirtd.service %else if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl enable \ virtlockd.socket \ virtlogd.socket \ + virtlogd-admin.socket \ libvirtd.service >/dev/null 2>&1 || : fi %endif @@ -1553,19 +1556,23 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/resta= rt || : %preun daemon %if %{with_systemd} %if %{with_systemd_macros} - %systemd_preun libvirtd.service virtlogd.socket virtlogd.service v= irtlockd.socket virtlockd.service + %systemd_preun libvirtd.service \ + virtlogd.socket virtlogd-admin.socket virtlogd.service \ + virtlockd.socket virtlockd.service %else if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable \ libvirtd.service \ virtlogd.socket \ + virtlogd-admin.socket \ virtlogd.service \ virtlockd.socket \ virtlockd.service > /dev/null 2>&1 || : /bin/systemctl stop \ libvirtd.service \ virtlogd.socket \ + virtlogd-admin.socket \ virtlogd.service \ virtlockd.socket \ virtlockd.service > /dev/null 2>&1 || : @@ -1613,9 +1620,9 @@ fi if [ $1 -ge 1 ] ; then %if %{with_systemd} /bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 && - /bin/systemctl enable virtlogd.socket || : + /bin/systemctl enable virtlogd.socket virtlogd-admin.socket ||= : /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 && - /bin/systemctl start virtlogd.socket || : + /bin/systemctl start virtlogd.socket virtlogd-admin.socket || : %else /sbin/chkconfig libvirtd 1>/dev/null 2>&1 && /sbin/chkconfig virtlogd on || : @@ -1820,6 +1827,7 @@ exit 0 %{_unitdir}/virt-guest-shutdown.target %{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.socket +%{_unitdir}/virtlogd-admin.socket %{_unitdir}/virtlockd.service %{_unitdir}/virtlockd.socket %else diff --git a/src/Makefile.am b/src/Makefile.am index 79adc9ba5..3d7b8f7c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2810,6 +2810,7 @@ EXTRA_DIST +=3D \ locking/test_virtlockd.aug.in \ logging/virtlogd.service.in \ logging/virtlogd.socket.in \ + logging/virtlogd-admin.socket.in \ logging/virtlogd.aug \ logging/virtlogd.conf \ logging/test_virtlogd.aug.in \ @@ -2824,12 +2825,13 @@ if LIBVIRT_INIT_SCRIPT_SYSTEMD SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system =20 BUILT_SOURCES +=3D virtlockd.service virtlockd.socket \ - virtlogd.service virtlogd.socket + virtlogd.service virtlogd.socket virtlogd-admin.socket DISTCLEANFILES +=3D virtlockd.service virtlockd.socket \ - virtlogd.service virtlogd.socket + virtlogd.service virtlogd.socket virtlogd-admin.socket =20 install-systemd: virtlockd.service virtlockd.socket \ - virtlogd.service virtlogd.socket install-sysconfig + virtlogd.service virtlogd.socket virtlogd-admin.socket \ + install-sysconfig $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) $(INSTALL_DATA) virtlockd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ @@ -2839,12 +2841,15 @@ install-systemd: virtlockd.service virtlockd.socket= \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ $(INSTALL_DATA) virtlogd.socket \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ + $(INSTALL_DATA) virtlogd-admin.socket \ + $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ =20 uninstall-systemd: uninstall-sysconfig rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket + $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket \ + $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd-admin.socket rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : else ! LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: @@ -2879,6 +2884,13 @@ virtlogd.socket: logging/virtlogd.socket.in $(top_bu= ilddir)/config.status < $< > $@-t && \ mv $@-t $@ =20 +virtlogd-admin.socket: logging/virtlogd-admin.socket.in \ + $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + =20 if WITH_SANLOCK lockdriver_LTLIBRARIES +=3D sanlock.la --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 16:45:52 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 151794346479083.83695154473787; Tue, 6 Feb 2018 10:57:44 -0800 (PST) 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 9953D33BD7; Tue, 6 Feb 2018 18:57:43 +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 73D325C25F; Tue, 6 Feb 2018 18:57:43 +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 3EE1C4A46C; Tue, 6 Feb 2018 18:57:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w16Iuh2L007043 for ; Tue, 6 Feb 2018 13:56:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id E3988609A5; Tue, 6 Feb 2018 18:56:43 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-116-232.phx2.redhat.com [10.3.116.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1B4260C89 for ; Tue, 6 Feb 2018 18:56:40 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Tue, 6 Feb 2018 13:56:26 -0500 Message-Id: <20180206185626.7171-3-jferlan@redhat.com> In-Reply-To: <20180206185626.7171-1-jferlan@redhat.com> References: <20180206185626.7171-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] lockd: Install the admin sockets 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.38]); Tue, 06 Feb 2018 18:57:44 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit id 'ce7ae55e' added support for the lockd admin socket, but forgot to add the socket to the make and spec files for installation purposes. Signed-off-by: John Ferlan Reviewed-by: Daniel P. Berrange --- libvirt.spec.in | 8 ++++++-- src/Makefile.am | 19 +++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d94031067..44f846a16 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1520,7 +1520,7 @@ exit 0 =20 %if %{with_systemd} %if %{with_systemd_macros} - %systemd_post virtlockd.socket \ + %systemd_post virtlockd.socket virtlockd-admin.socket \ virtlogd.socket virtlogd-admin.socket \ libvirtd.service %else @@ -1528,6 +1528,7 @@ if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl enable \ virtlockd.socket \ + virtlockd-admin.socket \ virtlogd.socket \ virtlogd-admin.socket \ libvirtd.service >/dev/null 2>&1 || : @@ -1558,7 +1559,7 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart= || : %if %{with_systemd_macros} %systemd_preun libvirtd.service \ virtlogd.socket virtlogd-admin.socket virtlogd.service \ - virtlockd.socket virtlockd.service + virtlockd.socket virtlockd-admin.socket virtlockd.service %else if [ $1 -eq 0 ] ; then # Package removal, not upgrade @@ -1568,6 +1569,7 @@ if [ $1 -eq 0 ] ; then virtlogd-admin.socket \ virtlogd.service \ virtlockd.socket \ + virtlockd-admin.socket \ virtlockd.service > /dev/null 2>&1 || : /bin/systemctl stop \ libvirtd.service \ @@ -1575,6 +1577,7 @@ if [ $1 -eq 0 ] ; then virtlogd-admin.socket \ virtlogd.service \ virtlockd.socket \ + virtlockd-admin.socket \ virtlockd.service > /dev/null 2>&1 || : fi %endif @@ -1830,6 +1833,7 @@ exit 0 %{_unitdir}/virtlogd-admin.socket %{_unitdir}/virtlockd.service %{_unitdir}/virtlockd.socket +%{_unitdir}/virtlockd-admin.socket %else %{_sysconfdir}/rc.d/init.d/libvirtd %{_sysconfdir}/rc.d/init.d/virtlogd diff --git a/src/Makefile.am b/src/Makefile.am index 3d7b8f7c3..64ffcd98d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2805,6 +2805,7 @@ MAINTAINERCLEANFILES +=3D $(MANINFILES) EXTRA_DIST +=3D \ locking/virtlockd.service.in \ locking/virtlockd.socket.in \ + locking/virtlockd-admin.socket.in \ locking/virtlockd.aug \ locking/virtlockd.conf \ locking/test_virtlockd.aug.in \ @@ -2824,12 +2825,12 @@ if LIBVIRT_INIT_SCRIPT_SYSTEMD =20 SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system =20 -BUILT_SOURCES +=3D virtlockd.service virtlockd.socket \ +BUILT_SOURCES +=3D virtlockd.service virtlockd.socket virtlockd-admin.sock= et \ virtlogd.service virtlogd.socket virtlogd-admin.socket -DISTCLEANFILES +=3D virtlockd.service virtlockd.socket \ +DISTCLEANFILES +=3D virtlockd.service virtlockd.socket virtlockd-admin.soc= ket \ virtlogd.service virtlogd.socket virtlogd-admin.socket =20 -install-systemd: virtlockd.service virtlockd.socket \ +install-systemd: virtlockd.service virtlockd.socket virtlockd-admin.socket= \ virtlogd.service virtlogd.socket virtlogd-admin.socket \ install-sysconfig $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) @@ -2837,6 +2838,8 @@ install-systemd: virtlockd.service virtlockd.socket \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ $(INSTALL_DATA) virtlockd.socket \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ + $(INSTALL_DATA) virtlockd-admin.socket \ + $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ $(INSTALL_DATA) virtlogd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ $(INSTALL_DATA) virtlogd.socket \ @@ -2846,7 +2849,8 @@ install-systemd: virtlockd.service virtlockd.socket \ =20 uninstall-systemd: uninstall-sysconfig rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket + $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket \ + $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd-admin.socket rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd-admin.socket @@ -2872,6 +2876,13 @@ virtlockd.socket: locking/virtlockd.socket.in $(top_= builddir)/config.status < $< > $@-t && \ mv $@-t $@ =20 +virtlockd-admin.socket: locking/virtlockd-admin.socket.in \ + $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]sbindir[@]|$(sbindir)|g' \ --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list