dir plugin: get notes: return undef if notes are not supported

[pve-storage.git] / PVE / Storage / NFSPlugin.pm

diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm
index 72e06c2ec2599979454280f0e41a477c1f335e94..21b288a239f3c3a50c5301c2bd51c9329703a7dd 100644 (file)
--- a/PVE/Storage/NFSPlugin.pm
+++ b/PVE/Storage/NFSPlugin.pm
@@ -5,6 +5,8 @@ use warnings;
 use IO::File;
 use Net::IP;
 use File::Path;
+
+use PVE::Network;
 use PVE::Tools qw(run_command);
 use PVE::ProcFSTools;
 use PVE::Storage::Plugin;
@@ -88,6 +90,7 @@ sub options {
        format => { optional => 1 },
        mkdir => { optional => 1 },
        bwlimit => { optional => 1 },
+       preallocation => { optional => 1 },
     };
 }
 
@@ -164,9 +167,16 @@ sub check_connection {
 
     my $cmd;
     if (defined($opts) && $opts =~ /vers=4.*/) {
+       my $ip = PVE::JSONSchema::pve_verify_ip($server, 1);
+       if (!defined($ip)) {
+           $ip = PVE::Network::get_ip_from_hostname($server);
+       }
+
+       my $transport = PVE::JSONSchema::pve_verify_ipv4($ip, 1) ? 'tcp' : 'tcp6';
+
        # nfsv4 uses a pseudo-filesystem always beginning with /
        # no exports are listed
-       $cmd = ['/usr/sbin/rpcinfo', '-t', $server, 'nfs', '4'];
+       $cmd = ['/usr/sbin/rpcinfo', '-T', $transport, $ip, 'nfs', '4'];
     } else {
        $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server];
     }