diff options
| author | Brian Olsen <brian@maven-group.org> | 2023-09-29T16·50+0200 |
|---|---|---|
| committer | Brian Olsen <me@griff.name> | 2023-10-02T15·46+0000 |
| commit | cfb810d81a4f5ba60e8d3c5502390d60799aa636 (patch) | |
| tree | 0c3ddac2a5ee38151db245475d0159c09b6028cb /tvix/store/Cargo.toml | |
| parent | 5c2cad0ac48d7f223fe76b27d3d7ea9d38529e25 (diff) | |
fix(tvix/store): Fix FUSE support on MacOS r/6687
This partially fixes b/312 and gets FUSE to work again on MacOS. It is mostly small type changes and an update to fuse-backend-rs because upstream currently doesn't work with MacFuse. It also sets the default FUSE thread count on MacOS to 1 because otherwise the mount command will hang when shutting down as only one thread gets ENODEV and all the others just keep blocking. Change-Id: Ifb3c4268caf296c487049c1dc4618acb32497f44 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9490 Tested-by: BuildkiteCI Reviewed-by: Connor Brewster <cbrewster@hey.com> Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/store/Cargo.toml')
| -rw-r--r-- | tvix/store/Cargo.toml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index da3d23cb309a..d566ebed7059 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -34,9 +34,9 @@ tokio-listener = { version = "0.2.1" } [dependencies.fuse-backend-rs] optional = true -# TODO: Switch back to upstream version once https://github.com/cloud-hypervisor/fuse-backend-rs/pull/153 lands. -git = "https://github.com/cloud-hypervisor/fuse-backend-rs" -rev = "402e7c531bc75bc44ac366dc59477de8b5d4ca08" +# TODO: Switch back to upstream version once https://github.com/cloud-hypervisor/fuse-backend-rs/pull/157 lands. +git = "https://github.com/griff/fuse-backend-rs" +branch = "macfuse-fix" [dependencies.vhost] optional = true |