about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2018-12-26 15:30:04 -0500
committerDomen Kožar <domen@enlambda.com>2018-12-26 22:51:31 +0000
commit889ef35303ff8223708ac74e58cc02dbbecaf964 (patch)
tree5de1b5c978adc23adef19a3950b4dc4d58642b9a /pkgs
parent8e79ebc523d01aee24a29aaeff794e3a94830c74 (diff)
downloadnixlib-889ef35303ff8223708ac74e58cc02dbbecaf964.tar
nixlib-889ef35303ff8223708ac74e58cc02dbbecaf964.tar.gz
nixlib-889ef35303ff8223708ac74e58cc02dbbecaf964.tar.bz2
nixlib-889ef35303ff8223708ac74e58cc02dbbecaf964.tar.lz
nixlib-889ef35303ff8223708ac74e58cc02dbbecaf964.tar.xz
nixlib-889ef35303ff8223708ac74e58cc02dbbecaf964.tar.zst
nixlib-889ef35303ff8223708ac74e58cc02dbbecaf964.zip
linuxPackages_4_{19,20}: works around bug with overlayfs.
See: https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix10
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d54e0153229d..dc41c2e5f15d 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -58,4 +58,14 @@ rec {
     };
   };
 
+  # Reverts a change related to the overlayfs overhaul in 4.19
+  # https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626
+  revert-vfs-dont-open-real = rec {
+	name = "revert-vfs-dont-open-real";
+	patch = fetchpatch {
+	  name = name + ".patch";
+	  url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch;
+	  sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq";
+	};
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df31f22eb9fa..eba2c979b42f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14562,6 +14562,7 @@ in
         # when adding a new linux version
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.revert-vfs-dont-open-real
       ];
   };
 
@@ -14572,6 +14573,7 @@ in
         # when adding a new linux version
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.revert-vfs-dont-open-real
       ];
   };