public_git
/
democratic-csi
mirror of https://github.com/democratic-csi/democratic-csi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 6c7a26b8be into 55c36d62ff

This commit is contained in:
Roelof 2025-07-28 10:21:14 +02:00 committed by GitHub
parent 55c36d62ff 6c7a26b8be
commit 6c310fa6a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/driver/freenas/http/api.js
View File

@ -127,15 +127,8 @@ class Api {
const systemVersion = await this.getSystemVersion(); const systemVersion = await this.getSystemVersion();
const major = await this.getSystemVersionMajor(); const major = await this.getSystemVersionMajor();
// starting with version 25 the version string no longer contains `-SCALE` // the first SCALE version was Angelfish ALPHA
if ( return (systemVersion.v2 && Number(major) >= 20);
systemVersion.v2 &&
(systemVersion.v2.toLowerCase().includes("scale") || Number(major) >= 20)
) {
return true;
}
return false;
} }
async getSystemVersionMajorMinor() { async getSystemVersionMajorMinor() {

8
src/driver/freenas/ssh.js
View File

@ -2178,12 +2178,10 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
async getIsScale() { async getIsScale() {
const systemVersion = await this.getSystemVersion(); const systemVersion = await this.getSystemVersion();
const major = await this.getSystemVersionMajor();
if (systemVersion.v2 && systemVersion.v2.toLowerCase().includes("scale")) { // the first SCALE version was Angelfish ALPHA
return true; return (systemVersion.v2 && Number(major) >= 20);
}
return false;
} }
async getSystemVersionMajorMinor() { async getSystemVersionMajorMinor() {