From nobody Mon Feb 9 20:11:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689345596; cv=none; d=zohomail.com; s=zohoarc; b=G/94rFQFehfTW79UjVx4pavaLfwiWj+ygivhqt7l99olW7NhVIv7iTP2VRD02NngEnbbjtZPO5ipHKFV2/CDhYUwyFwbqL2Kz8+v3+vb8NaLXIwR1cvoTQRDH2W17BIVwIs1N53p8Yb0EfPSFsre4q7rk2l2ZI4fNOVXhEBQk7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689345596; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PkPjS56WtJA1vR5thKYcPf+cVA+kpw88VQ4JgNG+PDE=; b=Xqm4TW1ZTH8SMdwV25ePcX20C92qjrR3VyMfRDOkYLYG+NkG5TDdQ+25/uVGlJA2GLWha39y7ngKub1on1a4sgb7lTFEj732iM2z9F2ezJfbCBiJhBcAcXLAHgOLRwTHU4hNr8QKoMiGoyqvg64zeOu35sci/jQIucXjXGKiY/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1689345596168602.6827130096063; Fri, 14 Jul 2023 07:39:56 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-284-V1wtg833N5SGzpAAbr94sw-1; Fri, 14 Jul 2023 10:39:53 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 465061C068DD; Fri, 14 Jul 2023 14:39:50 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E7DF2166B27; Fri, 14 Jul 2023 14:39:50 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 614FC1946A40; Fri, 14 Jul 2023 14:39:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AC20F1946594 for ; Fri, 14 Jul 2023 14:39:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9A9DF2166B27; Fri, 14 Jul 2023 14:39:48 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2CBA92166B25 for ; Fri, 14 Jul 2023 14:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689345595; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=PkPjS56WtJA1vR5thKYcPf+cVA+kpw88VQ4JgNG+PDE=; b=LeqIDUqEKyY0RbQN7pATppHmf+rbEeOcSLrkl3Kb5JgpuPCDb7Ra5VIeRCbActVNzaOd0l EMdo+pgcdLDjOJcjHnPeeKfSKHiBk3tqlZEpnzvFTcXQOD+fjTikNAsElpzB1pCjIsNnD8 A7835rQQnoQgYXAyJ2OIUwLWvquUWa0= X-MC-Unique: V1wtg833N5SGzpAAbr94sw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 5/8] rpm: Remove custom libvirtd restart logic Date: Fri, 14 Jul 2023 16:39:39 +0200 Message-ID: <20230714143942.125179-6-abologna@redhat.com> In-Reply-To: <20230714143942.125179-1-abologna@redhat.com> References: <20230714143942.125179-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689345597808100007 Content-Type: text/plain; charset="utf-8"; x-default="true" This logic was necessary when socket activation was introduced in libvirt 5.6.0/5.7.0 in order to guarantee smooth upgrades. These days, even the oldest platform that we target ships a version of libvirtd that implements socket activation, so the additional code is no longer useful and we can treat libvirtd the same as all other services. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- libvirt.spec.in | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c9317ed0cc..d09c3b3340 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1492,39 +1492,7 @@ fi \ =20 %posttrans daemon %libvirt_sysconfig_posttrans libvirtd -if test %libvirt_daemon_needs_restart libvirtd -then - # See if user has previously modified their install to - # tell libvirtd to use --listen - grep -E '^LIBVIRTD_ARGS=3D.*--listen' /etc/sysconfig/libvirtd 1>/dev/n= ull 2>&1 - if test $? =3D 0 - then - # Then lets keep honouring --listen and *not* use - # systemd socket activation, because switching things - # might confuse mgmt tool like puppet/ansible that - # expect the old style libvirtd - /bin/systemctl mask \ - libvirtd.socket \ - libvirtd-ro.socket \ - libvirtd-admin.socket \ - libvirtd-tls.socket \ - libvirtd-tcp.socket >/dev/null 2>&1 || : - /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : - else - # Old libvirtd owns the sockets and will delete them on - # shutdown. Can't use a try-restart as libvirtd will simply - # own the sockets again when it comes back up. Thus we must - # do this particular ordering, so that we get libvirtd - # running with socket activation in use - /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || : - /bin/systemctl try-restart \ - libvirtd.socket \ - libvirtd-ro.socket \ - libvirtd-admin.socket >/dev/null 2>&1 || : - /bin/systemctl start libvirtd.service >/dev/null 2>&1 || : - fi -fi -%libvirt_daemon_finish_restart libvirtd +%libvirt_daemon_perform_restart libvirtd =20 %preun daemon %libvirt_daemon_systemd_preun_inet libvirtd --=20 2.41.0