diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2019-12-22 19:50:41 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2019-12-22 19:51:16 -0500 |
| commit | baa243d508601dc42123df4074419a1b8286c77a (patch) | |
| tree | dc6d02438c982440dfa12b86de745722a602d30b /pkgs/os-specific/linux/kernel | |
| parent | e8fc6c06f9ca10f84b980c25e7df0297ec9e3e93 (diff) | |
| download | nixpkgs-baa243d508601dc42123df4074419a1b8286c77a.tar nixpkgs-baa243d508601dc42123df4074419a1b8286c77a.tar.gz nixpkgs-baa243d508601dc42123df4074419a1b8286c77a.tar.bz2 nixpkgs-baa243d508601dc42123df4074419a1b8286c77a.tar.lz nixpkgs-baa243d508601dc42123df4074419a1b8286c77a.tar.xz nixpkgs-baa243d508601dc42123df4074419a1b8286c77a.tar.zst nixpkgs-baa243d508601dc42123df4074419a1b8286c77a.zip | |
linux: Fix request-key for 4.4 and 4.9
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/request-key-helper-updated.patch | 13 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4ec232d6255..2af64c2ddc4 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -11,6 +11,11 @@ patch = ./request-key-helper.patch; }; + request_key_helper_updated = + { name = "request-key-helper-updated"; + patch = ./request-key-helper-updated.patch; + }; + p9_fixes = { name = "p9-fixes"; patch = ./p9-fixes.patch; diff --git a/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch b/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch new file mode 100644 index 00000000000..aabb9e801be --- /dev/null +++ b/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch @@ -0,0 +1,13 @@ +diff --git a/security/keys/request_key.c b/security/keys/request_key.c +index 88172c163953..4da74a1eebb2 100644 +--- a/security/keys/request_key.c ++++ b/security/keys/request_key.c +@@ -161,7 +161,7 @@ static int call_sbin_request_key(struct key_construction *cons, + + /* set up the argument list */ + i = 0; +- argv[i++] = "/sbin/request-key"; ++ argv[i++] = "/run/current-system/sw/bin/request-key"; + argv[i++] = (char *) op; + argv[i++] = key_str; + argv[i++] = uid_str; |