followup: only parse version if required, fix whitespace error

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2020-04-25 11:18:03 +02:00
parent e54c3e3347
commit 81c5c736ca

View File

@ -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;
}