Merge 8ef05936d8 into 73af26298c

.github/workflows/main.yml

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

src/driver/freenas/ssh.js

@@ -121,15 +121,6 @@ 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",
-        };
-      }
     }
   }
 
@@ -152,13 +143,10 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
   }
 
   async getTrueNASHttpApiClient() {
-    return this.ctx.registry.getAsync(
-      `${__REGISTRY_NS__}:api_client`,
-      async () => {
+    return this.ctx.registry.getAsync(`${__REGISTRY_NS__}:api_client`, async () => {
       const httpClient = await this.getHttpClient();
       return new TrueNASApiClient(httpClient, this.ctx.cache);
-      }
-    );
+    });
   }
 
   getDriverShareType() {