From nobody Wed Jan 15 10:02:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 172528185158874.65945068946246; Mon, 2 Sep 2024 05:57:31 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8181B13F8; Mon, 2 Sep 2024 08:57:30 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2762F13DA; Mon, 2 Sep 2024 08:56:57 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D22009E5; Mon, 2 Sep 2024 08:56:51 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6161F167 for ; Mon, 2 Sep 2024 08:56:51 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-64-an02Y_C3PDSBVQZ90iUpOQ-1; Mon, 02 Sep 2024 08:56:49 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A4F571955D44 for ; Mon, 2 Sep 2024 12:56:48 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.24]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B9A4E300019A for ; Mon, 2 Sep 2024 12:56:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725281811; h=from:from: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; bh=HugUakaCRdYVZGxzdn1fRjClA79axWDKQdmmytvfje0=; b=eXLQYUvw+wMs41ZdfrJ8T4ygGV9VCzjgXiiFL5FH6OGQhdu9TJ55XyuP6qssAciVctbfgK NrYeXWAwQymug1yG50ERQdvqreoq1o55xqWCsLYXSeZ8TwxHcM2dBOE5LRy7j+VR0eYUJI hjd4m8kYUPbXghW3Qt5o86bxhzyQ9Iw= X-MC-Unique: an02Y_C3PDSBVQZ90iUpOQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 1/2] storage: fs: Remove build-time detection of 'showmount' program Date: Mon, 2 Sep 2024 14:56:43 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CIYD2FP5TN54OO5WTXVBWM3FWMUSDS5F X-Message-ID-Hash: CIYD2FP5TN54OO5WTXVBWM3FWMUSDS5F X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725281852456116600 Content-Type: text/plain; charset="utf-8" With the new virCommand infrastructure which can find the program in path automatically we no longer need the build-time detection. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- libvirt.spec.in | 2 -- meson.build | 7 ------- src/storage/storage_backend_fs.c | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 29101e74fe..7e421898f6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -429,8 +429,6 @@ BuildRequires: audit-libs-devel BuildRequires: systemtap-sdt-devel # For mount/umount in FS driver BuildRequires: util-linux -# For showmount in FS driver (netfs discovery) -BuildRequires: nfs-utils %if %{with_numad} BuildRequires: numad %endif diff --git a/meson.build b/meson.build index eb4b608e85..297fbfae48 100644 --- a/meson.build +++ b/meson.build @@ -1855,13 +1855,6 @@ if conf.has('WITH_LIBVIRTD') conf.set_quoted('MOUNT', mount_prog.full_path()) conf.set_quoted('UMOUNT', umount_prog.full_path()) conf.set_quoted('MKFS', mkfs_prog.full_path()) - - showmount_prog =3D find_program('showmount', required: false, dirs: = libvirt_sbin_path) - showmount_path =3D '' - if showmount_prog.found() - showmount_path =3D showmount_prog.full_path() - endif - conf.set_quoted('SHOWMOUNT', showmount_path) endif endif diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend= _fs.c index 1851704d21..fce395d60f 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -106,7 +106,7 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNet= fsDiscoverState *state) g_autoptr(virCommand) cmd =3D NULL; - cmd =3D virCommandNewArgList(SHOWMOUNT, + cmd =3D virCommandNewArgList("showmount", "--no-headers", "--exports", state->host, --=20 2.46.0 From nobody Wed Jan 15 10:02:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1725281868564250.6651045657843; Mon, 2 Sep 2024 05:57:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8402CAE3; Mon, 2 Sep 2024 08:57:47 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F3D48123A; Mon, 2 Sep 2024 08:56:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9B0F6A32; Mon, 2 Sep 2024 08:56:52 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2B33B9E5 for ; Mon, 2 Sep 2024 08:56:52 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-101-IM2IAJBhN36arr2NWuQUww-1; Mon, 02 Sep 2024 08:56:50 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 103C21954B20 for ; Mon, 2 Sep 2024 12:56:50 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.24]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 28E843002246 for ; Mon, 2 Sep 2024 12:56:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725281811; h=from:from: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; bh=alwJUAIVJm3WcO2t/wu2rArmD5xiTcecerm94SOggt4=; b=EVytolV7rAw0mHw1p8hwb5v1YaPLe+vkPptRqkqlIqEObKR9o0Htwqn1VJniqtfy+5Af7y aFb+GFsvNDhzNyDYMthvB7i6wqdYywuamCzfzg87GKN3rGeUzkrBS61g8EKFF5IV4DDAen uudKb0DwX9EkJZv61vH2goDB7hIfcEY= X-MC-Unique: IM2IAJBhN36arr2NWuQUww-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/2] spec: Demote 'nfs-utils' as a weak dependency of 'daemon-driver-storage-core' Date: Mon, 2 Sep 2024 14:56:44 +0200 Message-ID: <7385a1e2882c4564e70bfcef0c7da7b3fe8e9e95.1725281747.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: M66CW6VG3FWTASTIZKTBHD5ZT5PHW7WH X-Message-ID-Hash: M66CW6VG3FWTASTIZKTBHD5ZT5PHW7WH X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725281870504116600 Content-Type: text/plain; charset="utf-8" The 'nfs-utils' package provides 'showmount' used to detect NFS-based storage pool sources. As the lookup of storage pool sources can fail gracefully and does so e.g. if the gluster backend is not installed we can do the same for NFS. Apart from allowing a tighter footprint when installing libvirt, this also allows installation of the storage driver core in cases when a security policy prohibits use of NFS. Resolves: https://issues.redhat.com/browse/RHEL-56611 Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7e421898f6..4d6a1d268f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -667,7 +667,7 @@ an implementation of the secret key APIs. Summary: Storage driver plugin including base backends for the libvirtd da= emon Requires: libvirt-daemon-common =3D %{version}-%{release} Requires: libvirt-libs =3D %{version}-%{release} -Requires: nfs-utils +Recommends: nfs-utils # For mkfs Requires: util-linux # For storage wiping with different algorithms --=20 2.46.0