storage: fs: Remove build-time detection of 'showmount' program

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 <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2024-09-02 14:25:29 +02:00
parent 6f10d15ca1
commit ce1c9bb8ea
3 changed files with 1 additions and 10 deletions

View File

@ -429,8 +429,6 @@ BuildRequires: systemtap-sdt-devel
BuildRequires: /usr/bin/dtrace BuildRequires: /usr/bin/dtrace
# For mount/umount in FS driver # For mount/umount in FS driver
BuildRequires: util-linux BuildRequires: util-linux
# For showmount in FS driver (netfs discovery)
BuildRequires: nfs-utils
%if %{with_numad} %if %{with_numad}
BuildRequires: numad BuildRequires: numad
%endif %endif

View File

@ -1855,13 +1855,6 @@ if conf.has('WITH_LIBVIRTD')
conf.set_quoted('MOUNT', mount_prog.full_path()) conf.set_quoted('MOUNT', mount_prog.full_path())
conf.set_quoted('UMOUNT', umount_prog.full_path()) conf.set_quoted('UMOUNT', umount_prog.full_path())
conf.set_quoted('MKFS', mkfs_prog.full_path()) conf.set_quoted('MKFS', mkfs_prog.full_path())
showmount_prog = find_program('showmount', required: false, dirs: libvirt_sbin_path)
showmount_path = ''
if showmount_prog.found()
showmount_path = showmount_prog.full_path()
endif
conf.set_quoted('SHOWMOUNT', showmount_path)
endif endif
endif endif

View File

@ -106,7 +106,7 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state)
g_autoptr(virCommand) cmd = NULL; g_autoptr(virCommand) cmd = NULL;
cmd = virCommandNewArgList(SHOWMOUNT, cmd = virCommandNewArgList("showmount",
"--no-headers", "--no-headers",
"--exports", "--exports",
state->host, state->host,