From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Thu, 21 May 2015 08:24:52 +0000 (+0200)
Subject: NFS: replace rpcinfo with showmounts
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f8b0d82fe67e30feb260b95983f73b580f916c71;p=pve-storage.git

NFS: replace rpcinfo with showmounts

rpcinfo from rpcbind-0.2.1 in debian doesn't support ipv6 addresses.
At the same time the used command only actually tests for
portmapper/rpcbind availability, not for NFS directly.
Storage::scan_nfs uses /sbin/showmount to get a list of NFS exports from a
server and happily accepts ipv6 addresses. It is also more specific to NFS.

Replacing the rpcinfo call with showmount here means checking explicitly
for NFS and supporting IPv6 without the need for an updated rpcbind
package.
---

diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm
index 14aa4ed..68764b7 100644
--- a/PVE/Storage/NFSPlugin.pm
+++ b/PVE/Storage/NFSPlugin.pm
@@ -170,8 +170,7 @@ sub check_connection {
 
     my $server = $scfg->{server};
 
-    # test connection to portmapper
-    my $cmd = ['/usr/sbin/rpcinfo', '-p', $server];
+    my $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server];
 
     eval {
 	run_command($cmd, timeout => 2, outfunc => sub {}, errfunc => sub {});