yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSPlugin: deal with ipv6 addresses and fix regexps

Browse Source 
NFS needs brackets around ipv6 addresses.
Also: nfs_is_mounted needs to quote the variables. This becomes apparent
when ipv6 addresses are used as then the address would otherwise be
treated as a character class, causing the check to always fail.
This commit is contained in:
Wolfgang Bumiller
2015-05-20 16:57:31 +02:00
committed by Dietmar Maurer
parent 6bf617a954
commit da63f58832
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/Storage/NFSPlugin.pm
View File

@ -3,6 +3,7 @@ package PVE::Storage::NFSPlugin;
use strict; use strict;
use warnings; use warnings;
use IO::File; use IO::File;
use Net::IP;
use File::Path; use File::Path;
use PVE::Tools qw(run_command); use PVE::Tools qw(run_command);
use PVE::Storage::Plugin; use PVE::Storage::Plugin;
@ -28,11 +29,12 @@ sub read_proc_mounts {
sub nfs_is_mounted { sub nfs_is_mounted {
my ($server, $export, $mountpoint, $mountdata) = @_; my ($server, $export, $mountpoint, $mountdata) = @_;
$server = "[$server]" if Net::IP::ip_is_ipv6($server);
my $source = "$server:$export"; my $source = "$server:$export";
$mountdata = read_proc_mounts() if !$mountdata; $mountdata = read_proc_mounts() if !$mountdata;
if ($mountdata =~ m|^$source/?\s$mountpoint\snfs|m) { if ($mountdata =~ m|^\Q$source\E/?\s\Q$mountpoint\E\snfs|m) {
return $mountpoint; return $mountpoint;
} }
@ -42,6 +44,7 @@ sub nfs_is_mounted {
sub nfs_mount { sub nfs_mount {
my ($server, $export, $mountpoint, $options) = @_; my ($server, $export, $mountpoint, $options) = @_;
$server = "[$server]" if Net::IP::ip_is_ipv6($server);
my $source = "$server:$export"; my $source = "$server:$export";
my $cmd = ['/bin/mount', '-t', 'nfs', $source, $mountpoint]; my $cmd = ['/bin/mount', '-t', 'nfs', $source, $mountpoint];