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>

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 86af13a86139cbe9bd54536b493b00b22b5ab227..83867010f05c588cfef21cbb1a3d1b5d5932cf84 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -429,8 +429,6 @@ BuildRequires: systemtap-sdt-devel
 BuildRequires: /usr/bin/dtrace
 # 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 eb4b608e85b36437106275ee01c4824ad77116c1..297fbfae48337491d47943dfaf7c8a6d6129dd3a 100644 (file)
--- 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 = 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
 

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 1851704d21766b0fbc2320fe639d7af58f478221..fce395d60f15df173779c1a09846ac326a12b867 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -106,7 +106,7 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state)
 
     g_autoptr(virCommand) cmd = NULL;
 
-    cmd = virCommandNewArgList(SHOWMOUNT,
+    cmd = virCommandNewArgList("showmount",
                                "--no-headers",
                                "--exports",
                                state->host,