Merge 8ef05936d8 into 55c36d62ff

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>

.github/workflows/main.yml

@@ -20,7 +20,7 @@ jobs:
           access_token: ${{ github.token }}
 
   build-npm-linux-amd64:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4

src/driver/freenas/ssh.js

@@ -121,6 +121,15 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
           chroot: "/usr/sbin/chroot",
         };
       }
+
+      if (isScale && Number(majorMinor) >= 25) {
+        options.paths = {
+          zfs: "/usr/sbin/zfs",
+          zpool: "/usr/sbin/zpool",
+          sudo: "/usr/bin/sudo",
+          chroot: "/usr/sbin/chroot",
+        };
+      }
     }
   }
 
@@ -143,10 +152,13 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
   }
 
   async getTrueNASHttpApiClient() {
-    return this.ctx.registry.getAsync(`${__REGISTRY_NS__}:api_client`, async () => {
+    return this.ctx.registry.getAsync(
-      const httpClient = await this.getHttpClient();
+      `${__REGISTRY_NS__}:api_client`,
-      return new TrueNASApiClient(httpClient, this.ctx.cache);
+      async () => {
-    });
+        const httpClient = await this.getHttpClient();
+        return new TrueNASApiClient(httpClient, this.ctx.cache);
+      }
+    );
   }
 
   getDriverShareType() {