alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #111375 from Philipp-M/fix-zfs-path-sanitizer-patch

Browse source 
zfs: fix zfs legacy mount
This commit is contained in:
Jörg Thalheim 2021-02-01 07:59:42 +00:00 committed by GitHub
parent 5d9bf1bca8 c67f9d2935
commit 9b935b02e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/os-specific/linux/zfs/default.nix
View file

@ -21,6 +21,12 @@ let
buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildKernel = any (n: n == configFile) [ "kernel" "all" ];
buildUser = any (n: n == configFile) [ "user" "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 common = { version
, sha256 , sha256
, extraPatches ? [] , extraPatches ? []
@ -190,7 +196,7 @@ in {
sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
extraPatches = [ ]; extraPatches = [ reapplyPathSanitizerPatch ];
}; };
zfsUnstable = common { zfsUnstable = common {
@ -202,6 +208,6 @@ in {
sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
extraPatches = [ ]; extraPatches = [ reapplyPathSanitizerPatch ];
}; };
} }