From nobody Wed May 14 20:10:28 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 1518617865988578.219745754443; Wed, 14 Feb 2018 06:17:45 -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 A5DCD7247B; Wed, 14 Feb 2018 14:17:44 +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 77F0A5D967; Wed, 14 Feb 2018 14:17:44 +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 3F2004A473; Wed, 14 Feb 2018 14:17:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1EEBjmI006830 for ; Wed, 14 Feb 2018 09:11:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1845421411B6; Wed, 14 Feb 2018 14:11:45 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EC0B82141200 for ; Wed, 14 Feb 2018 14:11:44 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id DFFF91012F9; Wed, 14 Feb 2018 15:11:42 +0100 (CET) From: Jiri Denemark To: libvir-list@redhat.com Date: Wed, 14 Feb 2018 15:11:41 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/6] spec: Drop overlapping triggers 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.38]); Wed, 14 Feb 2018 14:17:45 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The postun trigger for libvirt-daemon was defined twice for overlapping ranges of package verions if systemd support was switched off (which happens when building on something ancient, such as RHEL-6). Let's combine the two triggers into the one which is called when libvirt-daemon < 1.3.0 is uninstalled. As a side effect, virtlockd and virtlogd might be reloaded twice after an upgrade from libvirt newer than 1.2.1 and older than 1.3.0 (by postun script from the old libvirt and postun trigger from the new libvirt). Signed-off-by: Jiri Denemark Reviewed-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f73fcab494..e1e902c5e4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1599,15 +1599,6 @@ if [ $1 -ge 1 ]; then fi %endif =20 -%if %{with_systemd} -%else -%triggerpostun daemon -- libvirt-daemon < 1.2.1 -if [ "$1" -ge "1" ]; then - /sbin/service virtlockd reload > /dev/null 2>&1 || : - /sbin/service virtlogd reload > /dev/null 2>&1 || : -fi -%endif - # In upgrade scenario we must explicitly enable virtlockd/virtlogd # sockets, if libvirtd is already enabled and start them if # libvirtd is running, otherwise you'll get failures to start @@ -1624,6 +1615,8 @@ if [ $1 -ge 1 ] ; then /sbin/chkconfig virtlogd on || : /sbin/service libvirtd status 1>/dev/null 2>&1 && /sbin/service virtlogd start || : + /sbin/service virtlockd reload > /dev/null 2>&1 || : + /sbin/service virtlogd reload > /dev/null 2>&1 || : %endif fi =20 --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list