From 401bcfce53e3678bd1ef5b4a636b8696a1b93d69 Mon Sep 17 00:00:00 2001 From: Hans Date: Sun, 20 Sep 2020 15:08:32 +0800 Subject: [PATCH] Support for TrueNAS SCALE version pattern --- perl5/PVE/Storage/LunCmd/FreeNAS.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perl5/PVE/Storage/LunCmd/FreeNAS.pm b/perl5/PVE/Storage/LunCmd/FreeNAS.pm index 7645d45..5445a9c 100644 --- a/perl5/PVE/Storage/LunCmd/FreeNAS.pm +++ b/perl5/PVE/Storage/LunCmd/FreeNAS.pm @@ -399,11 +399,11 @@ sub freenas_api_check { $result->{'fullversion'} =~ s/^"//g; } syslog("info", (caller(0))[3] . " : successful : Server version: " . $result->{'fullversion'}); - $result->{'fullversion'} =~ s/^(\w+)\-(\d+)\.(\d+)\-(?:U|BETA)(\d?)\.?(\d?)//; - my $freenas_version = sprintf("%02d%02d%02d%02d", $2, $3 || 0, $4 || 0, $5 || 0); + $result->{'fullversion'} =~ /^(\w+(?:-\w+)?)\-(\d+)\.(\d+)/; + my $freenas_version = sprintf("%02d%02d", $2, $3 || 0); $product_name = $1; syslog("info", (caller(0))[3] . " : ". $product_name . " Unformatted Version: " . $freenas_version); - if ($freenas_version >= 11030100) { + if ($freenas_version >= 1103) { $freenas_api_version = "v2.0"; $dev_prefix = "/dev/"; }