From nobody Mon Feb 9 08:28:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1618938847; cv=none; d=zohomail.com; s=zohoarc; b=IepF0xZ6dhZ+/xnfXkfT5SCoYAG+frg7H/P7Y9Bd/fwbPTA6MUGN3v6MqMXhR1Nzd8jl8KWBtyqDqI42hcbYKJn/mueymfkYViSr3YwQp8UNCr36elkgBwZVN+DpID5bo6Nk6YQKD7Of19TNv10u+C3U7QqiroPrLTQ+TUqaWF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618938847; 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=1X8M0b1vmCua/fjePH4xubJK4V0CEwdb5Yj58TtLolQ=; b=C+CS9/tdI+37bKu2OwrSQGNy9O+eVFssUEfMaoG528bhgRJA0GGqGLxozrTrAxtEczs19fziOT7D9i0V820X3F27RYcO0pmvUrRa2k09HitvOF72oh+9cCgCQEgj0YiQPUwIIwYdG/4Ne9wKso6Jfn4lmNlJNYX5txJ+evJFkXw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 161893884742385.64646278879127; Tue, 20 Apr 2021 10:14: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-587-YzMwSej1OCKf6Pm3Yw3rbw-1; Tue, 20 Apr 2021 13:13:58 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08CC28189D3; Tue, 20 Apr 2021 17:13:51 +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 D4CFD19D80; Tue, 20 Apr 2021 17:13:50 +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 9E3C41806D1B; Tue, 20 Apr 2021 17:13:50 +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 13KHDZla023406 for ; Tue, 20 Apr 2021 13:13:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2B4B450FAF; Tue, 20 Apr 2021 17:13:35 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.191]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 470A850F89 for ; Tue, 20 Apr 2021 17:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618938846; 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=1X8M0b1vmCua/fjePH4xubJK4V0CEwdb5Yj58TtLolQ=; b=M0SeUd3/PRFFMYRFrYLZf5cymHLfHnVWlUwHtIiRW5kMtzQnnwHYfo7CVR0Rgior7r2PW2 CUn3e2JdwxLIbsVqvKGXSitPJ6QEIcHRuHzKeRWr/Yny1oQshDUdz7WBbF6U8cESxTw2Y0 duZ6/lweQXo2NKX1sF+CYtbbuc6Jyqw= X-MC-Unique: YzMwSej1OCKf6Pm3Yw3rbw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v4 3/7] spec: Merge -admin package into -daemon Date: Tue, 20 Apr 2021 19:13:18 +0200 Message-Id: <20210420171322.544322-4-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.84 on 10.5.11.23 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" It's useful to have virt-admin around when debugging issues with libvirtd, and since it's a tiny binary we can simply include it in the -daemon package to ensure it's always going to be available when needed. Signed-off-by: Andrea Bolognani --- docs/kbase/rpm-deployment.rst | 12 +++++------- libvirt.spec.in | 24 +++++++++++------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/docs/kbase/rpm-deployment.rst b/docs/kbase/rpm-deployment.rst index 2563142a50..cc2a4eb288 100644 --- a/docs/kbase/rpm-deployment.rst +++ b/docs/kbase/rpm-deployment.rst @@ -27,13 +27,6 @@ RPM packages every other libvirt RPM package. Almost every deployment scenario would = be better served by picking one of the other RPMs listed below. =20 -* libvirt-admin - - The virt-admin tool, used for administrative operations on any libvirt - daemons. Most usefully it allows for logging filters and outputs to be - reconfigured on a running daemon without a restart. This is recommended - to be installed on any host running a libvirt daemon. - * libvirt-bash-completion =20 Argument auto-completion support for the Bash shell. This is shared code= that @@ -57,6 +50,11 @@ RPM packages virtlockd and virtproxyd daemons, plus a number of helpers, configuration files and other bits necessary to create and admin a virtualization host. =20 + The virt-admin tool, also included in this package, is used for + administrative operations on any libvirt daemons. Most usefully it allows + for logging filters and outputs to be reconfigured on a running daemon + without a restart. + * libvirt-daemon-config-network =20 The sample configuration file providing the 'default' virtual network th= at diff --git a/libvirt.spec.in b/libvirt.spec.in index f9af330186..db88b1bf3d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -430,6 +430,9 @@ Summary: Server side daemon and supporting files for li= bvirt library # The client side, i.e. shared libs are in a subpackage Requires: %{name}-libs =3D %{version}-%{release} =20 +# bash completion support for virt-admin +Requires: %{name}-bash-completion =3D %{version}-%{release} + # (client invokes 'nc' against the UNIX socket on the server) Requires: /usr/bin/nc =20 @@ -461,6 +464,10 @@ Requires: dbus # For uid creation during pre Requires(pre): shadow-utils =20 +# Ensure smooth upgrades +Obsoletes: libvirt-admin < 7.3.0 +Provides: libvirt-admin + %description daemon Server side daemon required to manage the virtualization capabilities of recent versions of Linux. Requires a hypervisor specific sub-RPM @@ -918,14 +925,6 @@ Requires: cyrus-sasl-gssapi %description libs Shared libraries for accessing the libvirt daemon. =20 -%package admin -Summary: Set of tools to control libvirt daemon -Requires: %{name}-libs =3D %{version}-%{release} -Requires: %{name}-bash-completion =3D %{version}-%{release} - -%description admin -The client side utilities to control the libvirt daemon. - %package bash-completion Summary: Bash completion script =20 @@ -1589,12 +1588,16 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtlogd %attr(0755, root, root) %{_sbindir}/virtlockd =20 +%{_mandir}/man1/virt-admin.1* %{_mandir}/man8/libvirtd.8* %{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlockd.8* %{_mandir}/man8/virtproxyd.8* %{_mandir}/man7/virkey*.7* =20 +%{_bindir}/virt-admin +%{_datadir}/bash-completion/completions/virt-admin + %files daemon-config-network %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml @@ -1911,11 +1914,6 @@ exit 0 =20 %{_datadir}/libvirt/test-screenshot.png =20 -%files admin -%{_mandir}/man1/virt-admin.1* -%{_bindir}/virt-admin -%{_datadir}/bash-completion/completions/virt-admin - %files bash-completion %{_datadir}/bash-completion/completions/vsh =20 --=20 2.26.3