From 81c5c736caae2dae2b521729bc54e7912e142201 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sat, 25 Apr 2020 11:18:03 +0200 Subject: [PATCH] followup: only parse version if required, fix whitespace error Signed-off-by: Thomas Lamprecht --- PVE/Storage/CephFSPlugin.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/PVE/Storage/CephFSPlugin.pm b/PVE/Storage/CephFSPlugin.pm index 54689ae..3f44cfe 100644 --- a/PVE/Storage/CephFSPlugin.pm +++ b/PVE/Storage/CephFSPlugin.pm @@ -80,7 +80,6 @@ EOF sub cephfs_mount { my ($scfg, $storeid) = @_; - my ($subversions) = PVE::CephConfig::ceph_version(); my $mountpoint = $scfg->{path}; my $subdir = $scfg->{subdir} // '/'; @@ -99,9 +98,9 @@ sub cephfs_mount { } else { push @opts, "name=$cmd_option->{userid}"; push @opts, "secretfile=$secretfile" if defined($secretfile); - - # FIXME: remove subversion check in PVE 7.0, not needed for >= Nautilus - # Luminous doesn't know the conf option + + # FIXME: remove version check in PVE 7.0, only needed for Luminous -> Nautilus + my ($subversions) = PVE::CephConfig::ceph_version(); push @opts, "conf=$configfile" if defined($configfile) && @$subversions[0] > 12; }