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;
sub plugindata {
return {
- content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1},
+ content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1, snippets => 1 },
{ images => 1 }],
format => [ { raw => 1, qcow2 => 1, vmdk => 1 } , 'raw' ],
};
path => { fixed => 1 },
server => { fixed => 1 },
export => { fixed => 1 },
- nodes => { optional => 1 },
+ nodes => { optional => 1 },
disable => { optional => 1 },
- maxfiles => { optional => 1 },
+ maxfiles => { optional => 1 },
+ 'prune-backups' => { optional => 1 },
options => { optional => 1 },
content => { optional => 1 },
format => { optional => 1 },
+ mkdir => { optional => 1 },
+ bwlimit => { optional => 1 },
};
}
my $server = $scfg->{server};
my $export = $scfg->{export};
- if (!nfs_is_mounted($server, $export, $path, $cache->{mountdata})) {
-
- # NOTE: only call mkpath when not mounted (avoid hang
- # when NFS server is offline
-
- mkpath $path;
+ if (!nfs_is_mounted($server, $export, $path, $cache->{mountdata})) {
+ # NOTE: only call mkpath when not mounted (avoid hang when NFS server is offline
+ mkpath $path if !(defined($scfg->{mkdir}) && !$scfg->{mkdir});
die "unable to activate storage '$storeid' - " .
"directory '$path' does not exist\n" if ! -d $path;
my ($class, $storeid, $scfg) = @_;
my $server = $scfg->{server};
+ my $opts = $scfg->{options};
+
+ 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', $transport, $ip, 'nfs', '4'];
+ } else {
+ $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server];
+ }
- my $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server];
-
- eval {
- run_command($cmd, timeout => 2, outfunc => sub {}, errfunc => sub {});
- };
+ eval { run_command($cmd, timeout => 10, outfunc => sub {}, errfunc => sub {}) };
if (my $err = $@) {
return 0;
}
return 1;
}
+sub get_volume_notes {
+ my $class = shift;
+ PVE::Storage::DirPlugin::get_volume_notes($class, @_);
+}
+sub update_volume_notes {
+ my $class = shift;
+ PVE::Storage::DirPlugin::update_volume_notes($class, @_);
+}
+
1;