Compare commits

..

No commits in common. "55c36d62ffb51c6ebd5c25b85300e27b9a7af803" and "73af26298cbb12fe215ffd07e21560a24b98edc6" have entirely different histories.

2 changed files with 5 additions and 17 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-latest runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4

View File

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