Compare commits

..

2 Commits

Author SHA1 Message Date
Travis Glenn Hansen 55c36d62ff newer ubuntu image for ci
Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
2025-05-30 08:14:54 -06:00
Travis Glenn Hansen edfdf86f2d fix for scale with ssh driver
Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
2025-05-30 07:59:09 -06:00
2 changed files with 17 additions and 5 deletions

View File

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

View File

@ -120,6 +120,15 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
chroot: "/usr/sbin/chroot", 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",
};
}
} }
} }
@ -142,10 +151,13 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
} }
async getTrueNASHttpApiClient() { 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(); const httpClient = await this.getHttpClient();
return new TrueNASApiClient(httpClient, this.ctx.cache); return new TrueNASApiClient(httpClient, this.ctx.cache);
}); }
);
} }
getDriverShareType() { getDriverShareType() {