nfs/glusterfs: is_mounted fixes
The parse_proc_mounts change made the glusterfs is_mounted check fail (causing it to be shown as inactive on the GUI). The NFS check was stricter (not allowing a trailing / in the source anymore).
This commit is contained in:
committed by
Dietmar Maurer
parent
4f692721be
commit
aed6c85d28
@ -74,7 +74,7 @@ sub glusterfs_is_mounted {
|
||||
|
||||
return $mountpoint if grep {
|
||||
$_->[2] eq 'fuse.glusterfs' &&
|
||||
$_->[0] eq $volume &&
|
||||
$_->[0] =~ /^\S+:\Q$volume\E$/ &&
|
||||
$_->[1] eq $mountpoint
|
||||
} @$mountdata;
|
||||
return undef;
|
||||
|
||||
@ -23,7 +23,7 @@ sub nfs_is_mounted {
|
||||
$mountdata = PVE::ProcFSTools::parse_proc_mounts() if !$mountdata;
|
||||
return $mountpoint if grep {
|
||||
$_->[2] eq 'nfs' &&
|
||||
$_->[0] eq $source &&
|
||||
$_->[0] =~ m|^\Q$source\E/?$| &&
|
||||
$_->[1] eq $mountpoint
|
||||
} @$mountdata;
|
||||
return undef;
|
||||
|
||||
Reference in New Issue
Block a user