From nobody Tue Feb 10 16:18:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1689345594; cv=none; d=zohomail.com; s=zohoarc; b=aP3gJVgQmJ/k4fUQrmvT04FQXiqJdn9ulXujet3FTmDTOs+Jf4bqpLshIPF0tkUZhFfuftJ5h9n7sC4GRBQ39usZwlixhDwCZxb/NwSF0ZfZaVFuQ4qnnEDgF3XwokRuuzTmbCitOBrqjBlcu8QBJA9daXyHdZSHOAUjnQfqf/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689345594; 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=MUEFRuxtwDqiqP5+pBvc8DARkJC+edCEYd3tWLNxp8w=; b=HuHBHaTx8D2TYx2uLRw326ePAEF+9ood/YRQS/vBVwrAZthGF84gmCx3FSuxsmGWa/wYRBl0ymgjy8zxmRZQj5HV7qpKXSeF9DVbYN2h3l5IwF2CiQMgGD+ljc5XGdIf7rmyq5Bpj0FFgdjOuXlsv++gL8f+l1KdggtAGnGnXps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1689345594576922.1401058708511; Fri, 14 Jul 2023 07:39:54 -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-67-gaYslV8GPGSOOXPT_KIITA-1; Fri, 14 Jul 2023 10:39:52 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E5673852D91; Fri, 14 Jul 2023 14:39:49 +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 4A51B10E61; Fri, 14 Jul 2023 14:39:49 +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 2F4341946594; 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 ECD091946A54 for ; Fri, 14 Jul 2023 14:39:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DC7892166B28; Fri, 14 Jul 2023 14:39:47 +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 6E0812166B26 for ; Fri, 14 Jul 2023 14:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689345593; 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=MUEFRuxtwDqiqP5+pBvc8DARkJC+edCEYd3tWLNxp8w=; b=HTOIIyeLchf+QNYDj/FpqrhfOeFxfU3J4uNRsUO/RJ9O1MH2a+YbwO89QMrR6J06Qto+YO Ipa8y/UyvfCdMQJ6CEjVI5bs25a0mDhlqN3uLCoWwYRyNbhTduf1DQKdPF09mNS1xGbtLC gwvqPTF8B4JlqAv7VB9lBhJJR62kocQ= X-MC-Unique: gaYslV8GPGSOOXPT_KIITA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 4/8] rpm: Reduce use of with_modular_daemons Date: Fri, 14 Jul 2023 16:39:38 +0200 Message-ID: <20230714143942.125179-5-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.5 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: 1689345596484100004 Content-Type: text/plain; charset="utf-8"; x-default="true" The current implementation pretty much assumes that targets where modular daemons are the default will stick with that configuration, as will targets where they're not, or that changes to these defaults will be performed by the admin after the packages have been installed. This is unnecessarily limiting: for example, on a target that defaults to using the monolithic daemon, it's entirely possible to create a local preset such as # /etc/systemd/system-preset/00-virt.preset disable libvirtd.service disable libvirtd*.socket enable virtqemud.service to opt into a modular daemon deployment. The opposite is of course also true. We shouldn't get in the way of these reasonable use cases. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- libvirt.spec.in | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index db8d9158ae..c9317ed0cc 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1487,9 +1487,7 @@ fi \ %libvirt_sysconfig_pre libvirtd =20 %post daemon -%if ! %{with_modular_daemons} %libvirt_daemon_systemd_post_inet libvirtd -%endif %libvirt_daemon_schedule_restart libvirtd =20 %posttrans daemon @@ -1591,9 +1589,7 @@ fi %libvirt_sysconfig_pre virtproxyd =20 %post daemon-proxy -%if %{with_modular_daemons} %libvirt_daemon_systemd_post_inet virtproxyd -%endif =20 %posttrans daemon-proxy %libvirt_sysconfig_posttrans virtproxyd @@ -1609,9 +1605,7 @@ fi %firewalld_reload %endif =20 -%if %{with_modular_daemons} %libvirt_daemon_systemd_post virtnetworkd -%endif %libvirt_daemon_schedule_restart virtnetworkd =20 %posttrans daemon-driver-network @@ -1630,9 +1624,7 @@ fi %libvirt_sysconfig_pre virtnwfilterd =20 %post daemon-driver-nwfilter -%if %{with_modular_daemons} %libvirt_daemon_systemd_post virtnwfilterd -%endif %libvirt_daemon_schedule_restart virtnwfilterd =20 %posttrans daemon-driver-nwfilter @@ -1646,9 +1638,7 @@ fi %libvirt_sysconfig_pre virtnodedevd =20 %post daemon-driver-nodedev -%if %{with_modular_daemons} %libvirt_daemon_systemd_post virtnodedevd -%endif %libvirt_daemon_schedule_restart virtnodedevd =20 %posttrans daemon-driver-nodedev @@ -1662,9 +1652,7 @@ fi %libvirt_sysconfig_pre virtinterfaced =20 %post daemon-driver-interface -%if %{with_modular_daemons} %libvirt_daemon_systemd_post virtinterfaced -%endif %libvirt_daemon_schedule_restart virtinterfaced =20 %posttrans daemon-driver-interface @@ -1678,9 +1666,7 @@ fi %libvirt_sysconfig_pre virtsecretd =20 %post daemon-driver-secret -%if %{with_modular_daemons} %libvirt_daemon_systemd_post virtsecretd -%endif %libvirt_daemon_schedule_restart virtsecretd =20 %posttrans daemon-driver-secret @@ -1694,9 +1680,7 @@ fi %libvirt_sysconfig_pre virtstoraged =20 %post daemon-driver-storage-core -%if %{with_modular_daemons} %libvirt_daemon_systemd_post virtstoraged -%endif %libvirt_daemon_schedule_restart virtstoraged =20 %posttrans daemon-driver-storage-core @@ -1724,9 +1708,7 @@ fi exit 0 =20 %post daemon-driver-qemu - %if %{with_modular_daemons} %libvirt_daemon_systemd_post virtqemud - %endif %libvirt_daemon_schedule_restart virtqemud =20 %posttrans daemon-driver-qemu @@ -1742,9 +1724,7 @@ exit 0 %libvirt_sysconfig_pre virtlxcd =20 %post daemon-driver-lxc - %if %{with_modular_daemons} %libvirt_daemon_systemd_post virtlxcd - %endif %libvirt_daemon_schedule_restart virtlxcd =20 %posttrans daemon-driver-lxc @@ -1760,9 +1740,7 @@ exit 0 %libvirt_sysconfig_pre virtvboxd =20 %post daemon-driver-vbox - %if %{with_modular_daemons} %libvirt_daemon_systemd_post virtvboxd - %endif %libvirt_daemon_schedule_restart virtvboxd =20 %posttrans daemon-driver-vbox @@ -1778,9 +1756,7 @@ exit 0 %libvirt_sysconfig_pre virtxend =20 %post daemon-driver-libxl - %if %{with_modular_daemons} %libvirt_daemon_systemd_post virtxend - %endif %libvirt_daemon_schedule_restart virtxend =20 %posttrans daemon-driver-libxl --=20 2.41.0