diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2017-08-19 18:50:53 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2017-09-21 23:59:46 +0200 |
| commit | 351f5fc58519be059f9d6703f2f90a39ba2d1839 (patch) | |
| tree | 7512ddcdfbf0f7cc94879b45ff94540a1923697b /nixos/modules/security/wrappers | |
| parent | 62f8e255a49e485742096bf985cd81d3af9280e6 (diff) | |
| download | nixlib-351f5fc58519be059f9d6703f2f90a39ba2d1839.tar nixlib-351f5fc58519be059f9d6703f2f90a39ba2d1839.tar.gz nixlib-351f5fc58519be059f9d6703f2f90a39ba2d1839.tar.bz2 nixlib-351f5fc58519be059f9d6703f2f90a39ba2d1839.tar.lz nixlib-351f5fc58519be059f9d6703f2f90a39ba2d1839.tar.xz nixlib-351f5fc58519be059f9d6703f2f90a39ba2d1839.tar.zst nixlib-351f5fc58519be059f9d6703f2f90a39ba2d1839.zip | |
fuse3: init at 3.1.1
This includes fuse-common (fusePackages.fuse_3.common) as recommended by upstream. But while fuse(2) and fuse3 would normally depend on fuse-common we can't do that in nixpkgs while fuse-common is just another output from the fuse3 multiple-output derivation (i.e. this would result in a circular dependency). To avoid building fuse3 twice I decided it would be best to copy the shared files (i.e. the ones provided by fuse(2) and fuse3) from fuse-common to fuse (version 2) and avoid collision warnings by defining priorities. Now it should be possible to install an arbitrary combination of "fuse", "fuse3", and "fuse-common" without getting any collision warnings. The end result should be the same and all changes should be backwards compatible (assuming that mount.fuse from fuse3 is backwards compatible as stated by upstream [0] - if not this might break some /etc/fstab definitions but that should be very unlikely). My tests with sshfs (version 2 and 3) didn't show any problems. See #28409 for some additional information. [0]: https://github.com/libfuse/libfuse/releases/tag/fuse-3.0.0
Diffstat (limited to 'nixos/modules/security/wrappers')
| -rw-r--r-- | nixos/modules/security/wrappers/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index a6dc8faaae98..1f64213accd4 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -155,7 +155,10 @@ in ###### implementation config = { - security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount"; + security.wrappers = { + fusermount.source = "${pkgs.fuse}/bin/fusermount"; + fusermount3.source = "${pkgs.fuse3}/bin/fusermount3"; + }; boot.specialFileSystems.${parentWrapperDir} = { fsType = "tmpfs"; |