From nobody Tue Feb 10 08:28:04 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=1671732256; cv=none; d=zohomail.com; s=zohoarc; b=UW6sOEoJLzt5jFTlFBQC1vicv1qIcUlC4f/ahjW6JoO7wWgCpt56qMccPkIwveDdu8AkpQsxIJ3edpilToV4TuBLnfgttP5Fg9S+M9Zaw3tvBPza9eWgwSkU9O1S7L/RGPYggDWvnXLc5ZZ6nTHoCMVL55nCQI0S+RvRL30/Hm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671732256; 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=69POOHs94jdgNMeHu6Tx6NSEupKzhvZ0w1B55mNO2u8=; b=Ms9H/LDWKxuIEIlxhEZMDzmL0B5NedQXzTeGaTuFGJTELiiED70Ubgwcjhi6odt8hjAmJzep6qymK7nWoKygewhm2NRZFOWT6QvtJzWgh6MqYRxChJ5Bfzyrmcsn9eQRMVuqU9UN0fM3A1qR+QUJyrlCuQcboZBGWeCvkiCRQn4= 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 1671732256571563.6960597697216; Thu, 22 Dec 2022 10:04:16 -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-134-IV7FDkq8Oj-KzNWePNd4SA-1; Thu, 22 Dec 2022 13:04:13 -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 EEAE6101A52E; Thu, 22 Dec 2022 18:04:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6CAF40BC781; Thu, 22 Dec 2022 18:04:10 +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 B53B219465B9; Thu, 22 Dec 2022 18:04:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 30D8119465B1 for ; Thu, 22 Dec 2022 18:04:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 23F67492C18; Thu, 22 Dec 2022 18:04:09 +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 1BD3F492C14 for ; Thu, 22 Dec 2022 18:04:09 +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 F2F961C008D2 for ; Thu, 22 Dec 2022 18:04:08 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2070.outbound.protection.outlook.com [40.107.8.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-582-ean50I2OPkmkqberuW4Ekg-1; Thu, 22 Dec 2022 13:04:06 -0500 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by AS4PR04MB9364.eurprd04.prod.outlook.com (2603:10a6:20b:4e9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Thu, 22 Dec 2022 18:04:04 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f%3]) with mapi id 15.20.5944.012; Thu, 22 Dec 2022 18:04:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671732255; 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=69POOHs94jdgNMeHu6Tx6NSEupKzhvZ0w1B55mNO2u8=; b=C7ySTO8E0FbKKPhrsF85ogf4zg+q3XK3IO6ASrbTBmn4xqjka8YK4Bnn6n8JUqpORbEYiP X3/FuSIDjd+ySicW7WmidBQRvw8O3LsrYTyNFNabb/ZYryINC49XxpVJsBcfnoPsMGDzvw 4meUNpUsLygZgc45Eu9LDA42xBSlSJE= X-MC-Unique: IV7FDkq8Oj-KzNWePNd4SA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ean50I2OPkmkqberuW4Ekg-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH V4 05/11] spec: Rename the libvirt-lock-sanlock subpackage Date: Thu, 22 Dec 2022 11:03:36 -0700 Message-ID: <20221222180342.29311-6-jfehlig@suse.com> In-Reply-To: <20221222180342.29311-1-jfehlig@suse.com> References: <20221222180342.29311-1-jfehlig@suse.com> X-ClientProxiedBy: FR3P281CA0053.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::6) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|AS4PR04MB9364:EE_ X-MS-Office365-Filtering-Correlation-Id: 45b35d1b-cbbb-4f59-ec02-08dae446e967 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: sh0AuM3bX9fdltOna5Rly6S10yI5lck+tK9Z7y0gdgoaujPX0SwZdeitpBotpUHuJqJEBpDcs7TENO8mmvvBmwAGHU74zdEyt3f0/r31GRvoap7mDbYXKxFpSThhg3tOAqF8w/Keasf5zRCWshzSEhh+03WZsMLIB6ECgDe5kM29PfEKNT4GSuUwC5jjOYcjeh6HTeDmxszoiFWVI1eRJw4Qoq0O20u//pVCn73rsG9pg5d4HlcJH3TohBGxrEhGH9v7Pfl1fMPDYLefIOMVhL5/HpOaKNl+O8uDZbHwB8VT/1vSX1drXks+YHYfrxojPrvb6QlX3jbINnJ9G0STdMpICI7oIQhmr6Bask/PQYq1g2ahmyHQPkFmpp9BWczlUSgzuzzwK9ts7krJ8vAo6fkAJcx5zZIuqbq/TCDB41oC5UubcejhCIjSnlv3eQx27+GKDg/f54EkhwsGvhE/d0ckdJ86CCGBOppGYr8+udmNBneXC2y5hChjyhVrNpQ6a3BO99bkJ2Oiad6Z/GdSRi0ckLyqrIMRoOZV8TIiCTXm88fkXCMaM48IDyTQ9oCJYCfskGoCyJoxaxkvxG3cXdLpk/GIJufHIMFb+YQYM4TwH7z10WtAjuTH7FeWXyIMHPk88Bd7VZFp7NQvYIxUu6OHGMrDm/JCtqssGi8BFy6m0IDwdrMDk+9ufGRidYKS 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)(376002)(346002)(136003)(396003)(39860400002)(366004)(451199015)(6916009)(36756003)(316002)(6486002)(86362001)(26005)(478600001)(6666004)(41300700001)(8676002)(2906002)(8936002)(5660300002)(66556008)(66476007)(66946007)(6512007)(1076003)(2616005)(6506007)(38100700002)(186003)(83380400001)(21314003); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nCpDhE24afa5L5ywu3VQkNmwEL+VyHvDhiR2EzWZjREG9QHxxK9Ebqwhk2f8?= =?us-ascii?Q?2yCw0kPAGaR9RvvAyuSJu/cW56vHzVTTW03p3Vi9t6WGbGx6r67Efj84U5dg?= =?us-ascii?Q?Q6nQam6Ns3D+iZVxYJQJF/ZmRW/V1c/4qqPdBZIh4QWD2A7uhtS6xAMEC71r?= =?us-ascii?Q?CNp6IjE21vXUR94oBsG82jMCVMHS0E0p9SdV6UkcnFvOpgPFm7SfGCNgrLe2?= =?us-ascii?Q?38KUqqjtieF9Ukz4OD++j8+PgJ3jsm5ViH3kjgZV4B9OV8+QmvrNvCsiJ0Hv?= =?us-ascii?Q?+Ah2RBV8MMd4EHTbz8buxeF9GKwDih95LGFx02v7Fz6jOW5AEfzG6Ibocza8?= =?us-ascii?Q?q6pa039RH0Zso88FI2FqpnmN7TSDSUPU9VFzkAu58kN40B3QDzhhQ1txTFwr?= =?us-ascii?Q?MfdTKmPnc91gp7eqobKfOL1yKjZFb2iEcTzjZ8ugtIRBuToc1eXusb4InyyA?= =?us-ascii?Q?8+mwdGz145BUPPRF1Ou4N0X0vJL1H6WXtSeTXYaooab+2ezA8Ko18ClR1tLE?= =?us-ascii?Q?hblSnuxrpyVwhqp12rqTdswhQUBwtBsbKdVsC6K+COVHpEcnCW4O9g3vEnHy?= =?us-ascii?Q?W2mwD1OukZHlJzQrVre3bW1jNTinHFScYR9girLFJiCVfq8TSAAKksieB98F?= =?us-ascii?Q?HLNbsWEL7mLEfMI8kxGuVz3Q++wmtdxlO2lnavUawj3wYQzULx++jjHWpV/f?= =?us-ascii?Q?3pAkyagmyKvxxFLqKC9ah5HbfOKKXdTtqoFkv0vfcWmxku18cPAXfygrdCPG?= =?us-ascii?Q?YeAvQVCZMuiQQs6FZ3773L0qUyYtJ/PMaiddJ8wKUNzNwcOaruhh8GaTcSrn?= =?us-ascii?Q?28D1WluUbFuF1liVBUZQ8U2XCcPKeGDUhCuNznrwWSJZwxYF0TisexNlj20O?= =?us-ascii?Q?EYrYkVpvsVrA6PYMGv7um7YrCpVzWq71KzCipWIAE2YYeooKavBHcirTG3Mj?= =?us-ascii?Q?SV6gmC5QBjK87MSumuHaBMrs9G+BRKwkFvdmqNwP0cUNSWfGL8mVgF8wbpfQ?= =?us-ascii?Q?sEvKQGZtYOz2dVZ2+SQRga9528tdClcXPnrEYfCv5GDBLEtEHY52yKbAB6iP?= =?us-ascii?Q?dOcG/xlsTqfPhw1r4tx25SkMZGJzDUTZVu4YtAz24OriZ6haUaWkEqwCpE6/?= =?us-ascii?Q?EYBRW4sL72LzwGmz1nTl6geOFDLysUZlS1rhES6NPjXGIBWfvfz77tCGk27O?= =?us-ascii?Q?IJ/5TmqEcm6CFcUWxxXEVGO+cnYD+6XEJKvkCZDtb+LMkXGDWgVZJmbsSukm?= =?us-ascii?Q?Gdz+NFbsVuygefN0FIV/zxOr2qTZaw7QcZYfTZxJ2GeSllbZhnvSLAN4+7nB?= =?us-ascii?Q?dMCwHfG9hjPr3z2varTFRLAIk70zLi9Nk8LjHwbhvFVIYhR4BBThJN4FZG0e?= =?us-ascii?Q?UWIKkSoxyz35ulGRCxEFm9cz1QPAJRHt+oTijo9q6IyX5DhUyeMlBAm7ryyT?= =?us-ascii?Q?3njUmf8UNR4SV2i3qpbuIn47Va4eJgBkRbAg2sjaBa9wxXwb0grE7pBv+XbC?= =?us-ascii?Q?wj2c1n4T9Dcm13o7N17a64JCbay8wc+jPuvm7rBLdD9E/Fye7nj0HwxpxM5u?= =?us-ascii?Q?y4L59wY+mGNzHv1Iv9k=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45b35d1b-cbbb-4f59-ec02-08dae446e967 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2022 18:04:04.2185 (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: 59bl9cNsDdxZKqyN5xuMg/j5der3MTnN2k5u2k+RQWxDfXF+x58hoUKs/6ybaIb8ZIQcpciSKZULC73Xm+mQeA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9364 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.9 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: 1671732258347100001 Content-Type: text/plain; charset="utf-8" The new name "libvirt-daemon-plugin-sanlock" provides consistency with the newly introduced "libvirt-daemon-plugin-lockd" subpackage. It's also a good opportunity to taking ownership of %{_libdir}/libvirt/lock-driver/, removing the need for a dependency on the libvirt-daemon package. Signed-off-by: Jim Fehlig --- docs/kbase/rpm-deployment.rst | 12 ++++++------ libvirt.spec.in | 10 ++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/docs/kbase/rpm-deployment.rst b/docs/kbase/rpm-deployment.rst index 31805c2280..7685ee1291 100644 --- a/docs/kbase/rpm-deployment.rst +++ b/docs/kbase/rpm-deployment.rst @@ -289,6 +289,12 @@ RPM packages features, the subset of libvirt-daemon-driver-XXX packages should be used instead. =20 +* libvirt-daemon-plugin-sanlock + + This package provides the sanlock.so module, a daemon plugin that implem= ents + disk locking via communication with the sanlock daemon. It is optional a= nd + only relevant to hosts with the QEMU driver and oVirt management applica= tion. + * libvirt-daemon-qemu =20 This is an empty package that exists only as a convenient way to request @@ -352,12 +358,6 @@ RPM packages take to the libvirt daemons to utilize stateful drivers (QEMU, Xen, BHyv= e, LXC, VZ, etc). This is needed on all libvirt hosts, both client and serv= er. =20 -* libvirt-lock-sanlock - - A plugin for locking disks that communicates with the sanlock daemon. It= is - optional and only relevant to hosts with the QEMU driver and oVirt manag= ement - application. - * libvirt-login-shell =20 A simple login shell that automatically spawns an LXC container for the = user diff --git a/libvirt.spec.in b/libvirt.spec.in index cb4a6e8736..98497f639f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -956,15 +956,17 @@ Requires: pkgconfig Include header files & development libraries for the libvirt C library. =20 %if %{with_sanlock} -%package lock-sanlock +%package daemon-plugin-sanlock Summary: Sanlock lock manager plugin for QEMU driver Requires: sanlock >=3D 2.4 #for virt-sanlock-cleanup require augeas Requires: augeas Requires: libvirt-daemon =3D %{version}-%{release} Requires: libvirt-libs =3D %{version}-%{release} +Obsoletes: libvirt-lock-sanlock < 9.0.0 +Provides: libvirt-lock-sanlock =3D %{version}-%{release} =20 -%description lock-sanlock +%description daemon-plugin-sanlock Includes the Sanlock lock manager plugin for the QEMU driver %endif @@ -1822,7 +1824,6 @@ exit 0 %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ %dir %attr(0755, root, root) %{_libdir}/libvirt/ %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/ -%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/ %dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/ %dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/ %{_datadir}/augeas/lenses/libvirtd.aug @@ -2162,13 +2163,14 @@ exit 0 %endif =20 %if %{with_sanlock} -%files lock-sanlock +%files daemon-plugin-sanlock %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf %endif %if %{with_libxl} %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf %endif +%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/ %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so %{_datadir}/augeas/lenses/libvirt_sanlock.aug %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug --=20 2.38.1