From nobody Wed Dec 17 04:16:35 2025 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=1628009411; cv=none; d=zohomail.com; s=zohoarc; b=YX2DIDLDJGigUr6deF66G7mU2jKJwV0xlgpoilutp/fE3FNkKsKGY/Y2WI1R4dxaawHp3FRyiXsDk/sE3DuuP0TSwItMf3JZO6rvYJB0fbYxu8tDEQ/K3OJZN5Fxi27NFfY6KOX1cTRYH+Y3FMVY4lzn3PrpYZXCVXJM0JqD3oA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628009411; 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=0RnXBg1/Lew/YCVgayxnZuiFeklZkPvez3Sl7qb5pQo=; b=fZPbcSmYtYCZtTnvZIdoyu9iA3feJ8NMv9RSEjTXaCbu8PAqjAcQL+IkQaSbHGglYpJkNhu7y4WKeAF/tW0NVFm92DJ0jDS5/otbyK3+PwJreC0pbYJvpVwOp1VpPw2omwjJqXDB7EeaPKwwujICP1CC088rJ/CFweJpPdUQKFI= 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 1628009411770598.3070000987088; Tue, 3 Aug 2021 09:50:11 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-265-1HHL04t_NoaSM6T6Irf_HA-1; Tue, 03 Aug 2021 12:49:13 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DBF4393922; Tue, 3 Aug 2021 16:49:02 +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 BF44D7C1F0; Tue, 3 Aug 2021 16:49:02 +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 893F0473D6; Tue, 3 Aug 2021 16:49:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 173G89Hu017993 for ; Tue, 3 Aug 2021 12:08:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1309626FC0; Tue, 3 Aug 2021 16:08:09 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CCCF3AA2; Tue, 3 Aug 2021 16:08:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628009410; 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=0RnXBg1/Lew/YCVgayxnZuiFeklZkPvez3Sl7qb5pQo=; b=ePAm+qD5eOiJkAmHNO5biz5PbGf6yQCznJ1O5Y6Z2+Di1emkXogBdo5JD1Cm2WLFEHZNxW jw/xxLPRdXt6QWlqX6hnU0MsT3u4+lxXHXEDVS8Af8mL6y+/m/qxOutRfds0K5nT3hjKue gZnbeOPdSnYBLHjfKj+ziOL98PWS1L4= X-MC-Unique: 1HHL04t_NoaSM6T6Irf_HA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/6] rpm: handle enabling/disabling modular daemons post/postun-install Date: Tue, 3 Aug 2021 17:07:53 +0100 Message-Id: <20210803160754.3333793-6-berrange@redhat.com> In-Reply-To: <20210803160754.3333793-1-berrange@redhat.com> References: <20210803160754.3333793-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628009413245100001 We need to enable or disable the modular daemons with systemd after the RPM install/uninstall. Signed-off-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1494a18684..44d1e7a3c3 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -181,6 +181,11 @@ %define with_dmidecode 0%{!?_without_dmidecode:1} %endif =20 +%define with_modular_daemons 0 +%if 0%{?fedora} >=3D 35 || 0%{?rhel} >=3D 9 +%define with_modular_daemons 1 +%endif + # Force QEMU to run as non-root %define qemu_user qemu %define qemu_group qemu @@ -1282,7 +1287,11 @@ exit 0 %post daemon %libvirt_daemon_systemd_post virtlogd %libvirt_daemon_systemd_post virtlockdd +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post_inet virtproxyd +%else %libvirt_daemon_systemd_post_inet libvirtd +%endif =20 %systemd_post libvirt-guests.service =20 @@ -1292,6 +1301,7 @@ exit 0 %systemd_preun libvirt-guests.service =20 %libvirt_daemon_systemd_preun_inet libvirtd +%libvirt_daemon_systemd_preun_inet virtproxyd %libvirt_daemon_systemd_preun virtlogd %libvirt_daemon_systemd_preun virtlockdd =20 @@ -1360,8 +1370,14 @@ fi %firewalld_reload %endif =20 +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtnetworkd +%endif %libvirt_daemon_schedule_restart virtnetworkd =20 +%preun +%libvirt_daemon_systemd_preun virtnetworkd + %postun daemon-driver-network %if %{with_firewalld_zone} %firewalld_reload @@ -1372,64 +1388,118 @@ fi =20 =20 %post daemon-driver-nwfilter +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtnwfilterd +%endif %libvirt_daemon_schedule_restart virtnwfilterd =20 +%preun daemon-driver-nwfilter +%libvirt_daemon_systemd_preun virtnwfilterd + %posttrans daemon-driver-nwfilter %libvirt_daemon_perform_restart virtnwfilterd =20 =20 %post daemon-driver-nodedev +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtnodedevd +%endif %libvirt_daemon_schedule_restart virtnodedevd =20 +%preun daemon-driver-nodedev +%libvirt_daemon_systemd_preun virtnodedevd + %posttrans daemon-driver-nodedev %libvirt_daemon_perform_restart virtnodedevd =20 =20 %post daemon-driver-interface +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtinterfaced +%endif %libvirt_daemon_schedule_restart virtinterfaced =20 +%preun daemon-driver-interface +%libvirt_daemon_systemd_preun virtinterfaced + %posttrans daemon-driver-interface %libvirt_daemon_perform_restart virtinterfaced =20 =20 %post daemon-driver-secret +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtsecretd +%endif %libvirt_daemon_schedule_restart virtsecretd =20 +%preun daemon-driver-secret +%libvirt_daemon_systemd_preun virtsecretd + %posttranstrans daemon-driver-secret %libvirt_daemon_perform_restart virtsecretd =20 =20 %post daemon-driver-storage +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtstoraged +%endif %libvirt_daemon_schedule_restart virtstoraged =20 +%preun daemon-driver-storage +%libvirt_daemon_systemd_preun virtstoraged + %posttrans daemon-driver-storage %libvirt_daemon_perform_restart virtstoraged =20 =20 %post daemon-driver-qemu +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtqemud +%endif %libvirt_daemon_schedule_restart virtqemud =20 +%preun daemon-driver-qemu +%libvirt_daemon_systemd_preun virtqemud + %posttrans daemon-driver-qemu %libvirt_daemon_perform_restart virtqemud =20 =20 %post daemon-driver-lxc +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtlxcd +%endif %libvirt_daemon_schedule_restart virtlxcd =20 +%preun daemon-driver-lxc +%libvirt_daemon_systemd_preun virtlxcd + %posttrans daemon-driver-lxc %libvirt_daemon_perform_restart virtlxcd =20 =20 %post daemon-driver-vbox +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtvboxd +%endif %libvirt_daemon_schedule_restart virtvboxd =20 +%preun daemon-driver-vbox +%libvirt_daemon_systemd_preun virtvboxd + %posttrans daemon-driver-vbox %libvirt_daemon_perform_restart virtvboxd =20 =20 %post daemon-driver-libxl +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtxend +%endif %libvirt_daemon_schedule_restart virtxend =20 +%preun daemon-driver-libxl +%libvirt_daemon_systemd_preun virtxend + %posttrans daemon-driver-libxl %libvirt_daemon_perform_restart virtxend =20 --=20 2.31.1