diff options
| author | Philipp Mildenberger <philipp.mildenberger@koeln.de> | 2021-01-31 02:00:06 +0100 |
|---|---|---|
| committer | Philipp Mildenberger <philipp.mildenberger@koeln.de> | 2021-01-31 17:03:23 +0100 |
| commit | c67f9d2935caee3952b331efe3f08870054fd92a (patch) | |
| tree | 62335f30f4f1f268cf421b68ddc65fa470fe7dbc /pkgs/os-specific/linux/zfs | |
| parent | 4c181d179b765d4bfdeb66652f7b2737920bc2f4 (diff) | |
| download | nixpkgs-c67f9d2935caee3952b331efe3f08870054fd92a.tar nixpkgs-c67f9d2935caee3952b331efe3f08870054fd92a.tar.gz nixpkgs-c67f9d2935caee3952b331efe3f08870054fd92a.tar.bz2 nixpkgs-c67f9d2935caee3952b331efe3f08870054fd92a.tar.lz nixpkgs-c67f9d2935caee3952b331efe3f08870054fd92a.tar.xz nixpkgs-c67f9d2935caee3952b331efe3f08870054fd92a.tar.zst nixpkgs-c67f9d2935caee3952b331efe3f08870054fd92a.zip | |
zfs: fix zfs legacy mount
Closes #110376
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 86deebb5014..d61c0931e20 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -21,6 +21,12 @@ let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; + # remove this patch at the next ZFS release (> 2.0.1) + reapplyPathSanitizerPatch = fetchpatch { + url = "https://github.com/openzfs/zfs/commit/03f036cbccdd8699f5fe8540ef317595a35bceb8.patch"; + sha256 = "c157bbb6551a4e720c3faba005e1b72e4692d304c6ff5e0e685691bd47197dca"; + }; + common = { version , sha256 , extraPatches ? [] @@ -190,7 +196,7 @@ in { sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; - extraPatches = [ ]; + extraPatches = [ reapplyPathSanitizerPatch ]; }; zfsUnstable = common { @@ -202,6 +208,6 @@ in { sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; - extraPatches = [ ]; + extraPatches = [ reapplyPathSanitizerPatch ]; }; } |