From nobody Mon Feb 9 17:34:59 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=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1669245190; cv=none; d=zohomail.com; s=zohoarc; b=cAJRbGxcpZUJ7EfinhOVePIWGQdLFsfrZ0qM2/u2yS0o0D57TYE6uvGip6fhsAwTw7+FLD63gtzpF+NBjKXGYdOBs4C0rnynEYz/tLiNE34SpJYJtpBcvu/P3T2v+2dHe1kJUnopu29cxl72sRvRCNiazgsZwU117wmeINJ5i4g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669245190; 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=VJb3P/TNNmoyPQLz31TTx5g7HoEhdf0lw9wAVz8LX2A=; b=ITj2NE7vqWNUM76Sl5HeXlYQzgmGChb/9oWan9C7Mu0/hUUfBRgjyI0ceGGjCYy3oBCVPNdp4kwGqNrlDQl+Mv0i+z97Xdjo0udbDwFDtEgOhwBVmevjiCX9ZxCPC0zoEMkzgbv4tzNMobg329vt5u5fmtkkmpk/ZlmXLtDpgPM= 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=fail header.from= (p=quarantine dis=quarantine) 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 1669245190618318.5768404779267; Wed, 23 Nov 2022 15:13:10 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-452-ieoQ3oJcPZOa1BH7Cyj59w-1; Wed, 23 Nov 2022 18:12:28 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3C9AC85A588; Wed, 23 Nov 2022 23:12:26 +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 257444B3FC6; Wed, 23 Nov 2022 23:12:26 +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 131591946589; Wed, 23 Nov 2022 23:12:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DDE921946587 for ; Wed, 23 Nov 2022 23:12:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D238E492B0B; Wed, 23 Nov 2022 23:12:24 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA550492B07 for ; Wed, 23 Nov 2022 23:12:24 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AD467811E67 for ; Wed, 23 Nov 2022 23:12:24 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2088.outbound.protection.outlook.com [40.107.247.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-650-nLL0rNaYOWSUz6jzae45FQ-1; Wed, 23 Nov 2022 18:12:22 -0500 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by DU2PR04MB8792.eurprd04.prod.outlook.com (2603:10a6:10:2e3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.11; Wed, 23 Nov 2022 23:12:20 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f%4]) with mapi id 15.20.5834.015; Wed, 23 Nov 2022 23:12:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669245189; 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=VJb3P/TNNmoyPQLz31TTx5g7HoEhdf0lw9wAVz8LX2A=; b=F4qSMoGY099fQeHaOONDC/AdsUFxfEIk/z4I1YX66PIQKuQyFOaQneYvNHs2basAooyiT0 uTxfUJ25rL7ngfpwgBvEFrAGs/bBF16mWwdNe0leJp7ks4ZBHlfpPWFWX2LZ+waoKjTmLS u7fHxznPDgOQJDVF3AwSsu92YQTed0Q= X-MC-Unique: ieoQ3oJcPZOa1BH7Cyj59w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: nLL0rNaYOWSUz6jzae45FQ-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH RFC 6/6] spec: Move libvirt-guests to guests subpackage Date: Wed, 23 Nov 2022 16:11:55 -0700 Message-ID: <20221123231155.31612-7-jfehlig@suse.com> In-Reply-To: <20221123231155.31612-1-jfehlig@suse.com> References: <20221123231155.31612-1-jfehlig@suse.com> X-ClientProxiedBy: FR3P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::18) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|DU2PR04MB8792:EE_ X-MS-Office365-Filtering-Correlation-Id: 839a04c2-3a2c-4f8b-941d-08dacda82c0a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: WBKW5De2M8iGfzbcSSivGLAJj86vlJSk5dCsccnJiN1j+BbAFC627WmPdGBvEPDr9CJibSR5nvXCHQwEsUeIU5Jz4Hr6SjNeE8iZOq+t3MBoLDn2CTYEl5BTObP2LP6y7DdHctNc0V2jShy6Dxu9hg3X+TH8HliQvEByK2q874s5EhH2czD+hCq+vRzgnRpglCSwZWyc8/eRZCs9K2MGkj4382vUXkXKXf11F0JibVZJpnpZPuJK0Gsxfeg8ynZ2I+4hgvJe0x0Qspb8EQobBQwsF6JidCjCqhapPyQSFlfBtKPEXm8+UxNtIjrR99VjIScz60JaxD9CKRD7OBxuCO8epobUE3pxoXw0YdC2pVbKftoWDXRNIdEARDWhGqjhcsVPrn0ATRPvpfURYWPrLpM9nsHDu5HKdyJue4lKSKaQo7TpoYZHjet6+jNGe2fs7MBw+SHFWgIVrz6Uw+HwcSDxPzEdWzcnEPBUWVCrTn9zSvtoZ4Zwt2+/pHS+eFA/4zbeWJG5pYUVSwCSUnsOoHt2347MPhAAkqvgGvb4rEa6u6VoEoRoR0Gzn6rhQZ3TFqjRqMu4uMhJT9REUCTuPvSphEvOMriZClvwaRVfRG0wsj/GVjIhrbfRvCpx+XrjIgHJWtKZnL1wtMiEiGTkoQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR04MB4899.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(39860400002)(366004)(396003)(136003)(376002)(346002)(451199015)(6486002)(6506007)(6666004)(478600001)(2906002)(1076003)(26005)(186003)(36756003)(6512007)(38100700002)(83380400001)(86362001)(2616005)(8936002)(41300700001)(66946007)(66556008)(66476007)(8676002)(5660300002)(6916009)(316002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sfy4/3iyryi8MWAQJnZGlEBjrU3z48I6AUs4JQOBg5cOq6pWxoX7GL7JuuAk?= =?us-ascii?Q?MAjQxoErcGAvBSvmocz33UtAonsPe5lzuUnm4M3cjLDfyJif2pCe6hWO7LRt?= =?us-ascii?Q?k5MASyhLuoblZEwzP3eRbnhnyFLjJQiaAO+ai8Dnb8zVNnbUM6QWfi/9/1Lx?= =?us-ascii?Q?vIbQUZNs6Mwgd87nj377XxIOv0LPV0XKGoh7qzLEN3dE3T8HaVlti7YjgAYZ?= =?us-ascii?Q?yd19AFW8o1+bUTE+yRtz2u8ZQOpEqJmVH/krNZvH0G2EOsvaOihXnTz+T0H4?= =?us-ascii?Q?vNRi49w8QzvnkdJVNFS2VfeVDvExVaBEatCUpVeqDcxLzjo5nDtZpmElA/mc?= =?us-ascii?Q?ZpY8cga8AQhs5RdDPqBBdWgf4ESSxb2RZpO/L59PRsJWwVUGeG8hGxPKlDl7?= =?us-ascii?Q?5/i0tNiY4WZx28jajnqyOAaVcXWHuJNIvjjb5MRHaHBRAuJSXwepzGWDPu94?= =?us-ascii?Q?znm1QIKQTbh08FxSEYlnRM8eAOkxR28+PNv1Exhp86kpPYSGVox7W30pbd2D?= =?us-ascii?Q?jEyg9tdWqGmi6jlkBe5wp7sUE3rX8PvcFEO0yV5w4XRDj3Apy/djRyBLUby3?= =?us-ascii?Q?uYaHqXgoT6lRora2Bsw5kjmWxnrZRv0gJck8D2mz28uMelsknLYQ9E5BcDce?= =?us-ascii?Q?/Yi3hH4k+iZq3sOXciGURNUN61gbJyXRgUGBJa5QIaOQ3POQuLltoojCOMe9?= =?us-ascii?Q?M7BEoTUeQFSWFAageK8CR+Vmb6MqMTJoyHfnYNYd52EiHlEJ4d7FkkOUwBcu?= =?us-ascii?Q?WizAJa7HuviQcUvzbGyloPLM/A6fNJLu3g1s7i4iJW0osyDHR5Sn+kwT41Kx?= =?us-ascii?Q?q2AZu96o0oVC2DKPuiyaT3noeJCVilBlebJzYX1EBO+Y+JalpFGAL/b1ncte?= =?us-ascii?Q?VRj9/f9EWMobQdFEHWDz5K8IJxgvtXOhHNUeFAfZ+mm3JqytT8qlxYPGDPQj?= =?us-ascii?Q?Q00yyHHphyINAgxLowwYqavEw3EUyIfxM4OY56LhPIfL27D/AMNzlj72s8OZ?= =?us-ascii?Q?7mk74hrMOAV/1zrOuiZt4ybM5oLPEj7dxf1/eNPsHw2CgK/ir5ycgWMnYJB7?= =?us-ascii?Q?t41vomD6y6haMpPgHnBY4EDL8RK/wz0AzgP2i3CmJJ6ZCkxJ9Vza5tT2mUIX?= =?us-ascii?Q?fDPfjJtRrMM6cI5l4eW0eECNSCvpGWmAVKjiRZeUkWWR4lJNGmDfUT3mptSd?= =?us-ascii?Q?i3WVQ41re6HKkh0//1hQs2kZS5Dxbp88/0JL3VQe2KAPkY+fmCar/H4kr+7n?= =?us-ascii?Q?q3jGmo87QLHQ4DGZYjdq9p36CKIuIYpVez6QhNSs0kxZ7Atrs0LLcZ0C5Itd?= =?us-ascii?Q?CtmTAIwUlLlfmIjVzwJhndjDdKCj6EAq6NoYoZXbgLLA5wodzlFUGYv565tV?= =?us-ascii?Q?HYVf1V3l5xFYtiLDFqJRZ6kNv0i2XZVuY8z3QC+6hRzAsEaiW43l8As3j9ws?= =?us-ascii?Q?+Ew/lrIrtaHq5VN/0HZRZ3JrjEtvT0OZx4CO/GmDrKyuWt8Vs6won0q0oOVn?= =?us-ascii?Q?m9MEjbebKt6k0WVwC44pe2pqaye3HbeKXa7hAgw5BuMeRMmGjINOfGBk25xI?= =?us-ascii?Q?cgoNGbBSQifH1dddCR6b2ZgMtfRHBL2xWjZeeDVC?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 839a04c2-3a2c-4f8b-941d-08dacda82c0a X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2022 23:12:20.4374 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Drh24yhgP8eKdlCFT1caCYxt0BPIA42OlIFCe5cWex+TglXCJSyjYMC1HBBHIGudlXFv/gprel3Ghbhtej9FNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8792 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.9 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: 1669245192362100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jim Fehlig --- libvirt.spec.in | 64 +++++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c83e6a1ab3..11c163fa69 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -443,11 +443,8 @@ Requires: %{name}-daemon-core =3D %{version}-%{release} # The client side, i.e. shared libs are in a subpackage Requires: %{name}-libs =3D %{version}-%{release} =20 -# The libvirt-guests.sh script requires virsh from libvirt-client subpacka= ge, -# but not every deployment wants to use libvirt-guests service. Using -# Recommends here will install libvirt-client by default (if available), b= ut -# RPM won't complain if the package is unavailable, masked, or removed lat= er. -Recommends: %{name}-client =3D %{version}-%{release} +# Weak dependency on libvirt-guests for a smoother upgrade +Recommends: %{name}-guests =3D %{version}-%{release} =20 # netcat is needed on the server side so that clients that have # libvirt < 6.9.0 can connect, but newer versions will prefer @@ -478,12 +475,6 @@ Requires: numad Requires: dbus # For uid creation during pre Requires(pre): shadow-utils -# Needed by /usr/libexec/libvirt-guests.sh script. -%if 0%{?fedora} >=3D 37 -Requires: gettext-runtime -%else -Requires: gettext -%endif =20 # Ensure smooth upgrades Obsoletes: %{name}-admin < 7.3.0 @@ -502,6 +493,21 @@ Requires: %{name}-libs =3D %{version}-%{release} %description daemon-core Core daemons, utilities, and files used by the primary daemons =20 +%package guests +Summary: Service for suspending and resuming guests +Requires: %{name}-client =3D %{version}-%{release} + +# Needed by /usr/libexec/libvirt-guests.sh script. +%if 0%{?fedora} >=3D 37 +Requires: gettext-runtime +%else +Requires: gettext +%endif + +%description guests +libvirt-guests provides a service that can be used to coordinate guest +and host lifecycle actions + %package daemon-config-network Summary: Default configuration files for the libvirtd daemon =20 @@ -1439,7 +1445,7 @@ fi \ %define libvirt_daemon_systemd_preun_priv() %systemd_preun %1.service %1-a= dmin.socket %1.socket =20 %pre daemon -%libvirt_sysconfig_pre libvirtd libvirt-guests +%libvirt_sysconfig_pre libvirtd # 'libvirt' group is just to allow password-less polkit access to # libvirtd. The uid number is irrelevant, so we use dynamic allocation # described at the above link. @@ -1452,21 +1458,13 @@ exit 0 %libvirt_daemon_systemd_post_inet libvirtd %endif =20 -%systemd_post libvirt-guests.service - %libvirt_daemon_schedule_restart libvirtd =20 %preun daemon -%systemd_preun libvirt-guests.service - %libvirt_daemon_systemd_preun_inet libvirtd =20 -%postun daemon -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -%systemd_postun libvirt-guests.service - %posttrans daemon -%libvirt_sysconfig_posttrans libvirtd libvirt-guests +%libvirt_sysconfig_posttrans libvirtd if test %libvirt_daemon_needs_restart libvirtd then # See if user has previously modified their install to @@ -1501,6 +1499,22 @@ fi =20 %libvirt_daemon_finish_restart libvirtd =20 +%pre guests +%libvirt_sysconfig_pre libvirt-guests + +%post guests +%systemd_post libvirt-guests.service + +%preun guests +%systemd_preun libvirt-guests.service + +%postun guests +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +%systemd_postun libvirt-guests.service + +%posttrans guests +%libvirt_sysconfig_posttrans libvirt-guests + %pre daemon-core %libvirt_sysconfig_pre virtproxyd virtlogd virtlockd =20 @@ -1804,7 +1818,6 @@ exit 0 %{_unitdir}/libvirtd-tcp.socket %{_unitdir}/libvirtd-tls.socket %{_unitdir}/virt-guest-shutdown.target -%{_unitdir}/libvirt-guests.service %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf @@ -1815,10 +1828,15 @@ exit 0 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug =20 %attr(0755, root, root) %{_sbindir}/libvirtd + +%{_mandir}/man8/libvirtd.8* + +%files guests +%{_unitdir}/libvirt-guests.service + %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh =20 %{_mandir}/man8/libvirt-guests.8* -%{_mandir}/man8/libvirtd.8* =20 %files daemon-core %{_unitdir}/virtproxyd.service --=20 2.37.3