Compare commits
2 Commits
73af26298c
...
55c36d62ff
| Author | SHA1 | Date |
|---|---|---|
|
|
55c36d62ff | |
|
|
edfdf86f2d |
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -120,6 +120,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",
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -142,10 +151,13 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
|
|||
}
|
||||
|
||||
async getTrueNASHttpApiClient() {
|
||||
return this.ctx.registry.getAsync(`${__REGISTRY_NS__}:api_client`, async () => {
|
||||
const httpClient = await this.getHttpClient();
|
||||
return new TrueNASApiClient(httpClient, this.ctx.cache);
|
||||
});
|
||||
return this.ctx.registry.getAsync(
|
||||
`${__REGISTRY_NS__}:api_client`,
|
||||
async () => {
|
||||
const httpClient = await this.getHttpClient();
|
||||
return new TrueNASApiClient(httpClient, this.ctx.cache);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
getDriverShareType() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue