diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-02-01 07:59:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 07:59:42 +0000 |
| commit | 9b935b02e3775d95490f6586b88857a006e05fe5 (patch) | |
| tree | 8fc6316cbca1f46add6c7a39b829ffe0d2f67b88 | |
| parent | 5d9bf1bca801c68d0bc8cac24d80b3355c7e8957 (diff) | |
| parent | c67f9d2935caee3952b331efe3f08870054fd92a (diff) | |
Merge pull request #111375 from Philipp-M/fix-zfs-path-sanitizer-patch
zfs: fix zfs legacy mount
| -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 86deebb50140..d61c0931e20b 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 ]; }; } |