From 6c7a26b8be71de787a3bc048c32d22da4c5025e8 Mon Sep 17 00:00:00 2001 From: Roelof Jansen Date: Mon, 28 Jul 2025 10:12:58 +0200 Subject: [PATCH] fix: TrueNAS SCALE version determination. --- src/driver/freenas/http/api.js | 11 ++--------- src/driver/freenas/ssh.js | 8 +++----- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/driver/freenas/http/api.js b/src/driver/freenas/http/api.js index 79d7311..d1da784 100644 --- a/src/driver/freenas/http/api.js +++ b/src/driver/freenas/http/api.js @@ -127,15 +127,8 @@ class Api { const systemVersion = await this.getSystemVersion(); const major = await this.getSystemVersionMajor(); - // starting with version 25 the version string no longer contains `-SCALE` - if ( - systemVersion.v2 && - (systemVersion.v2.toLowerCase().includes("scale") || Number(major) >= 20) - ) { - return true; - } - - return false; + // the first SCALE version was Angelfish ALPHA + return (systemVersion.v2 && Number(major) >= 20); } async getSystemVersionMajorMinor() { diff --git a/src/driver/freenas/ssh.js b/src/driver/freenas/ssh.js index 7163d7f..c6742c2 100644 --- a/src/driver/freenas/ssh.js +++ b/src/driver/freenas/ssh.js @@ -2178,12 +2178,10 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver { async getIsScale() { const systemVersion = await this.getSystemVersion(); + const major = await this.getSystemVersionMajor(); - if (systemVersion.v2 && systemVersion.v2.toLowerCase().includes("scale")) { - return true; - } - - return false; + // the first SCALE version was Angelfish ALPHA + return (systemVersion.v2 && Number(major) >= 20); } async getSystemVersionMajorMinor() {