From nobody Mon Feb 9 10:27:23 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=1618938907; cv=none; d=zohomail.com; s=zohoarc; b=MdPcAbWUM3aGRtmPQQx9DFMqHYi4d7uLS8izig1iNhL3LFo3viJ/EZ9sp+savhquoHTlfxjtHnLeD8P2UD2PJlXuyoaYTnjnWda1p33D2+UzzYah1pXEENv1K2zqhFawsx+tmNEuBENIUu5yFJ1UzimULti1Q+U1AuUU6aXSxSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618938907; 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=dBlqrLc3aqd3sMYnzRYHh/NphWk1dCvsyKcwpBRc2AM=; b=bbhPIthWcWYw1dUhfpJE4+d+zHEuhyDUeFgwNzPNJxVySqofhJCITqPK7KpEfnwknMz9tef+CpVRXBzJcMIyMDdolusKDKyeX381FNtmOaQ4jl82pQdWWDMRBYdhdKO6DhDPpK82cvMp9DhacXEURlYC8avCWRFprjka/2eR5UI= 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) header.from= 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 1618938907660593.9338774890384; Tue, 20 Apr 2021 10:15:07 -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-317-TBKVq7K_PI-HQ8LHPc4aQQ-1; Tue, 20 Apr 2021 13:14:07 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id A3646CC640; Tue, 20 Apr 2021 17:13:53 +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 7C3305D9CD; Tue, 20 Apr 2021 17:13:53 +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 487771806D1E; Tue, 20 Apr 2021 17:13:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13KHDao4023416 for ; Tue, 20 Apr 2021 13:13:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 95ACD50F89; Tue, 20 Apr 2021 17:13:36 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.191]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BF42B510ED for ; Tue, 20 Apr 2021 17:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618938905; 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=dBlqrLc3aqd3sMYnzRYHh/NphWk1dCvsyKcwpBRc2AM=; b=P6hOg4Jv59rhAq14HX3+xyJTADRYfFAxSRy49SMc1sLgh8BH2DEU/v2QTQPtCPnGDFBHpB XpCwDwP978sk1ZEc9ubzczcQGuMrd2iOVPqCwOIzeUe4DVZN4TMEv5I3kqf9SIgIcwoOYV EfxmY36u0+3frna0JDswrAVSRhVGpOg= X-MC-Unique: TBKVq7K_PI-HQ8LHPc4aQQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v4 4/7] spec: Move some files from -client to -daemon Date: Tue, 20 Apr 2021 19:13:19 +0200 Message-Id: <20210420171322.544322-5-abologna@redhat.com> In-Reply-To: <20210420171322.544322-1-abologna@redhat.com> References: <20210420171322.544322-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.14 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The -client package's purpose is enabling remote machines to connect to a virtualization host, but the virt-host-validate and libvirt-guests tools are designed to be run directly on the virtualization host and as such are a better fit for the -daemon package. With this change, installing and removing the -client package no longer needs to touch the systemd configuration. Signed-off-by: Andrea Bolognani --- libvirt.spec.in | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index db88b1bf3d..35e7219006 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -463,6 +463,8 @@ Requires: numad Requires: dbus # For uid creation during pre Requires(pre): shadow-utils +# Needed by /usr/libexec/libvirt-guests.sh script. +Requires: gettext =20 # Ensure smooth upgrades Obsoletes: libvirt-admin < 7.3.0 @@ -904,8 +906,6 @@ capabilities of VirtualBox %package client Summary: Client side utilities of the libvirt library Requires: %{name}-libs =3D %{version}-%{release} -# Needed by /usr/libexec/libvirt-guests.sh script. -Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils Requires: %{name}-bash-completion =3D %{version}-%{release} @@ -1326,6 +1326,7 @@ exit 0 %systemd_post libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket %systemd_post libvirtd-tcp.socket libvirtd-tls.socket %systemd_post libvirtd.service +%systemd_post libvirt-guests.service =20 # request daemon restart in posttrans mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : @@ -1337,6 +1338,7 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart= || : %systemd_preun libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket %systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service %systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service +%systemd_preun libvirt-guests.service =20 %postun daemon /bin/systemctl daemon-reload >/dev/null 2>&1 || : @@ -1344,6 +1346,7 @@ if [ $1 -ge 1 ] ; then /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1= || : /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 = || : fi +%systemd_postun libvirt-guests.service =20 # In upgrade scenario we must explicitly enable virtlockd/virtlogd # sockets, if libvirtd is already enabled and start them if @@ -1488,16 +1491,6 @@ fi exit 0 %endif =20 -%preun client - -%systemd_preun libvirt-guests.service - -%post client -%systemd_post libvirt-guests.service - -%postun client -%systemd_postun libvirt-guests.service - %if %{with_lxc} %pre login-shell getent group virtlogin >/dev/null || groupadd -r virtlogin @@ -1533,6 +1526,7 @@ exit 0 %{_unitdir}/virtlockd.service %{_unitdir}/virtlockd.socket %{_unitdir}/virtlockd-admin.socket +%{_unitdir}/libvirt-guests.service %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd %config(noreplace) %{_sysconfdir}/sysconfig/virtlogd @@ -1542,6 +1536,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf +%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf =20 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd @@ -1587,14 +1582,17 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtproxyd %attr(0755, root, root) %{_sbindir}/virtlogd %attr(0755, root, root) %{_sbindir}/virtlockd +%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh =20 %{_mandir}/man1/virt-admin.1* +%{_mandir}/man1/virt-host-validate.1* %{_mandir}/man8/libvirtd.8* %{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlockd.8* %{_mandir}/man8/virtproxyd.8* %{_mandir}/man7/virkey*.7* =20 +%{_bindir}/virt-host-validate %{_bindir}/virt-admin %{_datadir}/bash-completion/completions/virt-admin =20 @@ -1877,11 +1875,9 @@ exit 0 %{_mandir}/man1/virsh.1* %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-validate.1* -%{_mandir}/man1/virt-host-validate.1* %{_bindir}/virsh %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-validate -%{_bindir}/virt-host-validate =20 %{_datadir}/systemtap/tapset/libvirt_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp @@ -1891,11 +1887,6 @@ exit 0 =20 %{_datadir}/bash-completion/completions/virsh =20 - -%{_unitdir}/libvirt-guests.service -%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests -%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh - %files libs -f %{name}.lang %license COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf --=20 2.26.3