From 8b5ccc06b7bd3e61e62931e5dd0c093bf2bd8637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 12 Oct 2016 09:33:12 +0200 Subject: [PATCH] fix #1165: only check mount status when is_mountpoint is set otherwise the status() method returns garbage for non-mount point directory storages. --- PVE/Storage/DirPlugin.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PVE/Storage/DirPlugin.pm b/PVE/Storage/DirPlugin.pm index 39f3b30..629fa17 100644 --- a/PVE/Storage/DirPlugin.pm +++ b/PVE/Storage/DirPlugin.pm @@ -76,12 +76,14 @@ sub path_is_mounted { sub status { my ($class, $storeid, $scfg, $cache) = @_; - $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts() - if !$cache->{mountdata}; + if ($scfg->{is_mountpoint}) { + $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts() + if !$cache->{mountdata}; - my $path = $scfg->{path}; + my $path = $scfg->{path}; - return undef if !path_is_mounted($path, $cache->{mountdata}); + return undef if !path_is_mounted($path, $cache->{mountdata}); + } return $class->SUPER::status($storeid, $scfg, $cache); }