diff options
| author | Kai Wohlfahrt <kai.wohlfahrt@gmail.com> | 2019-11-27 14:39:38 +0000 |
|---|---|---|
| committer | Kai Wohlfahrt <kai.wohlfahrt@gmail.com> | 2019-12-12 12:23:30 +0000 |
| commit | ea55a2d8a9eb030b58a494c13d1fcf6e5e71e625 (patch) | |
| tree | 690949feb5ff1ebdfa18894fb8a8ea7538ec14ed /pkgs/os-specific/linux/kernel | |
| parent | 7b8388302d00a34b6eb0ec9aaacffe96df49a01e (diff) | |
| download | nixpkgs-ea55a2d8a9eb030b58a494c13d1fcf6e5e71e625.tar nixpkgs-ea55a2d8a9eb030b58a494c13d1fcf6e5e71e625.tar.gz nixpkgs-ea55a2d8a9eb030b58a494c13d1fcf6e5e71e625.tar.bz2 nixpkgs-ea55a2d8a9eb030b58a494c13d1fcf6e5e71e625.tar.lz nixpkgs-ea55a2d8a9eb030b58a494c13d1fcf6e5e71e625.tar.xz nixpkgs-ea55a2d8a9eb030b58a494c13d1fcf6e5e71e625.tar.zst nixpkgs-ea55a2d8a9eb030b58a494c13d1fcf6e5e71e625.zip | |
linux: patch request-key binary path
This is necessary for id mapping to work with NFS + Kerberos, and also touches #68106 and 634638.
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.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 fa5b168389b..4ec232d6255 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -6,6 +6,11 @@ patch = ./bridge-stp-helper.patch; }; + request_key_helper = + { name = "request-key-helper"; + patch = ./request-key-helper.patch; + }; + p9_fixes = { name = "p9-fixes"; patch = ./p9-fixes.patch; diff --git a/pkgs/os-specific/linux/kernel/request-key-helper.patch b/pkgs/os-specific/linux/kernel/request-key-helper.patch new file mode 100644 index 00000000000..8264e265aed --- /dev/null +++ b/pkgs/os-specific/linux/kernel/request-key-helper.patch @@ -0,0 +1,13 @@ +diff --git a/security/keys/request_key.c b/security/keys/request_key.c +index 957b9e3e1492..5436a0d8b81d 100644 +--- a/security/keys/request_key.c ++++ b/security/keys/request_key.c +@@ -114,7 +114,7 @@ static int call_usermodehelper_keys(const char *path, char **argv, char **envp, + */ + static int call_sbin_request_key(struct key *authkey, void *aux) + { +- static char const request_key[] = "/sbin/request-key"; ++ static char const request_key[] = "/run/current-system/sw/bin/request-key"; + struct request_key_auth *rka = get_request_key_auth(authkey); + const struct cred *cred = current_cred(); + key_serial_t prkey, sskey; |