From nobody Tue Feb 10 04:13:38 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=1670026739; cv=none; d=zohomail.com; s=zohoarc; b=iOgcQU5r9F7XXg1fa+07XpbPp/thhxcnYqCJpSw4AucVGGKEU8IXl4pzd8IdwIE2BdfPuug7tPiaAmhkMn6rhMDpFhLG/MRyTl9hN3XkHRSqgFwFgedDfYOsT8NNnQff3Pn+M9icGBSlfz9oETDJ1URsF7iUAGNPQFh+CY2rdKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670026739; 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=WnERaU5pZzSc+wvFKBDEzKhhnOsNNE2BVqGYmkLv5PU=; b=KHsu1dPlF4GXCe27/nig962AuRct9z0vZoYxpv9gwGSDBlS8Wq2Q3d36Xv/1ZMw8sCBsYNo/koP1s+EGK4pBtyNB8O6gWZ0P6dPY3MkWLQP/V/12Laqo4XC6iwuys210fAWvTK9vMyDkdp0dXDtjPRFh7TbrxpTSv+sHoK3Em5U= 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 1670026739911678.4495800137141; Fri, 2 Dec 2022 16:18:59 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [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-498-_SksEro_MH-3yuctAzKQ_Q-1; Fri, 02 Dec 2022 19:18:55 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A5A972802294; Sat, 3 Dec 2022 00:18:50 +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 2C90640D2999; Sat, 3 Dec 2022 00:18: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 35ECA19465A0; Sat, 3 Dec 2022 00:18:21 +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 0F24A1947050 for ; Sat, 3 Dec 2022 00:18:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DF55E215CDB1; Sat, 3 Dec 2022 00:18:19 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D7AAC215CDA1 for ; Sat, 3 Dec 2022 00:18:18 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 9BD691C05147 for ; Sat, 3 Dec 2022 00:18:06 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2040.outbound.protection.outlook.com [40.107.6.40]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-158-DBzfDjClMvmTv8ZygtDZZA-1; Fri, 02 Dec 2022 19:18:04 -0500 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by VI1PR04MB7168.eurprd04.prod.outlook.com (2603:10a6:800:129::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Sat, 3 Dec 2022 00:18:02 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f%7]) with mapi id 15.20.5880.010; Sat, 3 Dec 2022 00:18:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670026738; 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=WnERaU5pZzSc+wvFKBDEzKhhnOsNNE2BVqGYmkLv5PU=; b=GVGcVWDVxfUWgJq21UTRmQlNPt/Lff1jnlDOvxv8fy9P8p/h5dJ+pr6tynnqDS8R2qLp0k e/sX4PQnZ7uxLFbtuhSel3p7lFAscJozfDKksbxcrONHgsjfMEwME4svhp2399iACk+OSp XOP2eo3puHGi8Zc27b5ewMlQ550uwr8= X-MC-Unique: _SksEro_MH-3yuctAzKQ_Q-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: DBzfDjClMvmTv8ZygtDZZA-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 5/7] spec: Move common files to a new subpackage libvirt-daemon-client Date: Fri, 2 Dec 2022 17:17:36 -0700 Message-ID: <20221203001738.11442-6-jfehlig@suse.com> In-Reply-To: <20221203001738.11442-1-jfehlig@suse.com> References: <20221203001738.11442-1-jfehlig@suse.com> X-ClientProxiedBy: FR2P281CA0116.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9d::9) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|VI1PR04MB7168:EE_ X-MS-Office365-Filtering-Correlation-Id: 92dbe2c8-42a6-4eb9-7b42-08dad4c3d73d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: gflpsGMucVMF2TQPf14hHEuheR/drOSnQ9w6jmeQOh/j5ZZz/trJhKEBhdnw3ksMjSeQSX1lJ7K9KKLfkS6W7f25jXJFY9FJWeJcq7X3k8iS5sijZ/gMeTBY/P31feRApmXEt3peOpBYdZoJVFyT98erfD5wPki6Ld04lIHkMGzIw7xzWJXigqeJAB4Jjm9iO4ocWYfgZW1pg+3nZ40Z4T0qaC18aaLv4ols4axj5XtccV8Lb37IdHEk1iu7apR4uZGFn+sJG3FHElG1R0X35VZW/44rSW3yoi762Bk+UWeSlPAx9WQyzwu5ZMOWqFcUX54NMNxOz6A110bCZblLNbfXXMm9SNQaMkv6N+z68IkEpT0Y4lYNVfxmCG11JjKVIL1fVpZTrbiMxIup64ahkYGMN/bSD6u/lgAenwIIW5f/TAGFNu1qCUFQkbQdSl//a1xOgO2h6bCfg/BVlVlf4rvhM6QNQJLr7SPDo+wr8kFtcXmieJ8GbRWznvAUEaJVPJUjEb2WVLfBz0uJRbsnTNnlPWPrkspGlb/wbmXpOWc7OpImLT8lkhP6Z/5USNTN0AwcApyTlxKIKNc6AIVUBXFRGwOcarWvh8RQo47NsV+QMfaptCVlalII9qhix/yHPD8dFeDbbPdHEA4jPzlYWaUvxiF1tHD9fmEYcL7CRzQY3PKF4XI7JyamgyHEhfFM 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)(396003)(346002)(136003)(39860400002)(376002)(366004)(451199015)(36756003)(86362001)(6486002)(478600001)(6512007)(6506007)(186003)(26005)(6666004)(5660300002)(41300700001)(8936002)(66946007)(316002)(66556008)(66476007)(6916009)(8676002)(2906002)(38100700002)(2616005)(83380400001)(1076003); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sdPzUk8Ms36HZkoAp35K7owEfmhlrwTzokOSiPUTVB5pujj1zr4hWrqKay8/?= =?us-ascii?Q?HQb+flBzJYNyx6R+FTpFfW4SoHoaxSXqFqqoJHv5epXlKAPJNH7QnhIW/jNd?= =?us-ascii?Q?QF4TQUx1gVKRbUq/XLjhEXAE/KUNWCk4q5ZklprKfjiI2XWNev3/3iL/zCQN?= =?us-ascii?Q?OXnQWRRwJX0fdd6BRUnmOWiTQCPQE98WUGHWZgRnajaZ70kpBVbW/A0j+Um7?= =?us-ascii?Q?za7WMOIAMGvAdqh9TlmH5OUWOpU2AsPfJhL8nS/m3jzn6BAyxVO8aBenyN3G?= =?us-ascii?Q?BQMxTvsUUIZOnK3TO7PjYYyzO/HtMGkXQRLgjU20N7UyQBrquMkFG6AUWF0Y?= =?us-ascii?Q?JgQrnoPvzRyTznLUh8DQYgwxaHUy8BKgx3GveYIYXIfKOTle3aEmD7mbC6M/?= =?us-ascii?Q?WlZvNhDfAwIgRzkA3S+lqvQHS817xWwVRmjDAeFBP4zGCRZyNsU5rfzpUsWl?= =?us-ascii?Q?AnJGF5qODSaGfHv59MInF3X80mHjO4iMq6ffoiP+HueNUKXbKdwskV+EWUs6?= =?us-ascii?Q?yCsi/Ta8z0EBMG+fms1+dv4rAkgDU4sZ7e1lEm1UuoouxTza8FRO42mctSX2?= =?us-ascii?Q?beQERlUeTB+Ti/nj+WO2VgZ3NOBETQNe4swLy3co6LMVfVqSSuQbBYFOGpnC?= =?us-ascii?Q?ivHYpVSITwAwpXJ7V4SitC+hPxKuLOITcdLWiRRKJ5kyZcRmONXqYzGpveEG?= =?us-ascii?Q?mbXbBkVT5ZwjVhnLPl/7aJbQHbTjUWhLcXNBQGDbsJzixxYY3PNytlXenNDM?= =?us-ascii?Q?DycfCXq0BZTrhP1PV7PPLVWUIVBgBugByq8xYUeDh/0AfLgCuQJ9xm8L0Onq?= =?us-ascii?Q?d6UGZR+PEf/o3Ff8P4P3eo+IEruqcjyPMLrKGejaXxUwIzZV+mkVplQ5B+W4?= =?us-ascii?Q?2tLaUhEpslqrAi5/9ss1cToTDXZ2KNyj/RwRaz6BEtMdWE3BaLhQcUzRAwEg?= =?us-ascii?Q?4TPM5pWM9EDwH3yWGcH+2yhxrpZN8sNQdfz1L5XHxLyyQnYt5HUTDaO8wU5u?= =?us-ascii?Q?kK1ikLtP/+xHDsSw29n7Ih7FFE4OtRTDKOyH33jS3plf2FMC24C2qxthMOpE?= =?us-ascii?Q?/5JrYvwngZPp8tacITclIhjvtC+DQP3wW24wJqMc1pv/0S1bk60F6M1krim5?= =?us-ascii?Q?tE+VW1c9qmLCCBkyWTq/U4KcFfD7KqmEBPX0nHsc5D3tqsO/iGU73LG8sF8B?= =?us-ascii?Q?id3+T++dMnKsPf6pJ3puE7LKCjuOzjkSBKDxhsYNiy6CWPJpPOvJs3kIv0yp?= =?us-ascii?Q?nBt+nrSMiLK2NcG5NYy0+8Jue+C61ngQiic6cJ9gSUEu6t86YXxtGAc/pXnw?= =?us-ascii?Q?32zVw4EGRR7OqgOkYQBersYf3EYPNQnIgNzJOt54gBzcqcTYRqAT0MQ4FgJW?= =?us-ascii?Q?gVzuhSVCMvYUCiErspmnGo0df3tpdly6wW3tmTzLeQ7sYsZu69ej7tNqbKzd?= =?us-ascii?Q?ALQ/bmcywLwLgvMrxsYtR2UH2bW6wJ4SG/Kkv4kUubrsjySX86iymvDc4uMd?= =?us-ascii?Q?x21qEeg5P9EbEOjsTdC87ZsoWzMfQop8vJIEkTbQJOlkvnQq1zBT7jXKNuDX?= =?us-ascii?Q?AscAIVpiQiRD3ZAW1r+Cm8obr/I4OB5/k6GcavJS?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92dbe2c8-42a6-4eb9-7b42-08dad4c3d73d X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2022 00:18:02.4000 (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: mOOGpspD4vG0BbJEJ088Pq86xDy2zGd8W6zqwp8g9dKZzvf5icCHrlFowpnPwVg0ypH5kTHqfG9jKGKo91qCYQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7168 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.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.2 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: 1670026740407100007 Content-Type: text/plain; charset="utf-8" Move virt-admin, virt-host-validate, virt-ssh-helper, and libvirt-guests to a new libvirt-daemon-client subpackage. Signed-off-by: Jim Fehlig --- libvirt.spec.in | 68 +++++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d5243e859b..381f74c222 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -440,17 +440,12 @@ Summary: Server side daemon and supporting files for = libvirt library =20 # The client side, i.e. shared libs are in a subpackage Requires: libvirt-libs =3D %{version}-%{release} +Requires: libvirt-daemon-client =3D %{version}-%{release} Requires: libvirt-daemon-lock =3D %{version}-%{release} Requires: libvirt-daemon-plugin-lockd =3D %{version}-%{release} Requires: libvirt-daemon-log =3D %{version}-%{release} Requires: libvirt-daemon-proxy =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: libvirt-client =3D %{version}-%{release} - # netcat is needed on the server side so that clients that have # libvirt < 6.9.0 can connect, but newer versions will prefer # virt-ssh-helper. Making this a Recommends means that it gets @@ -480,6 +475,21 @@ Requires: numad Requires: dbus # For uid creation during pre Requires(pre): shadow-utils + +%description daemon +Server side daemon required to manage the virtualization capabilities +of recent versions of Linux. Requires a hypervisor specific sub-RPM +for specific drivers. + +%package daemon-client +Summary: Miscellaneous utilities +Requires: libvirt-libs =3D %{version}-%{release} +# 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: libvirt-client =3D %{version}-%{release} + # Needed by /usr/libexec/libvirt-guests.sh script. %if 0%{?fedora} >=3D 37 Requires: gettext-runtime @@ -492,10 +502,8 @@ Obsoletes: libvirt-admin < 7.3.0 Provides: libvirt-admin =3D %{version}-%{release} Obsoletes: libvirt-bash-completion < 7.3.0 =20 -%description daemon -Server side daemon required to manage the virtualization capabilities -of recent versions of Linux. Requires a hypervisor specific sub-RPM -for specific drivers. +%description daemon-client +Miscellaneous utilities for use with other libvirt daemons =20 %package daemon-lock Summary: Server side daemon for managing locks @@ -1464,7 +1472,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. @@ -1476,22 +1484,13 @@ exit 0 %if ! %{with_modular_daemons} %libvirt_daemon_systemd_post_inet libvirtd %endif - -%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 @@ -1526,6 +1525,22 @@ fi =20 %libvirt_daemon_finish_restart libvirtd =20 +%pre daemon-client +%libvirt_sysconfig_pre libvirt-guests + +%post daemon-client +%systemd_post libvirt-guests.service + +%preun daemon-client +%systemd_preun libvirt-guests.service + +%postun daemon-client +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +%systemd_postun libvirt-guests.service + +%posttrans daemon-client +%libvirt_sysconfig_posttrans libvirt-guests + %pre daemon-lock %libvirt_sysconfig_pre virtlockd =20 @@ -1855,7 +1870,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 @@ -1883,20 +1897,18 @@ exit 0 %{_datadir}/polkit-1/rules.d/50-libvirt.rules =20 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ +%attr(0755, root, root) %{_sbindir}/libvirtd +%{_mandir}/man8/libvirtd.8* =20 +%files daemon-client +%{_unitdir}/libvirt-guests.service %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper - %attr(0755, root, root) %{_bindir}/virt-ssh-helper - -%attr(0755, root, root) %{_sbindir}/libvirtd %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh - %{_mandir}/man1/virt-admin.1* %{_mandir}/man1/virt-host-validate.1* %{_mandir}/man8/virt-ssh-helper.8* %{_mandir}/man8/libvirt-guests.8* -%{_mandir}/man8/libvirtd.8* - %{_bindir}/virt-host-validate %{_bindir}/virt-admin %{_datadir}/bash-completion/completions/virt-admin --=20 2.38.1