diff options
| author | Linus Heckemann <git@sphalerite.org> | 2021-03-08 21:34:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-08 21:34:59 +0100 |
| commit | c762b1eaab5c0ea237faf775c2c382f8508b8018 (patch) | |
| tree | a0ad66aea1a73024ebd330ec27fbf0f699da9625 /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | 9e76aa2cca8b21f2dad37d1e18573248104938a8 (diff) | |
| parent | d81067f3f3c1c82231eeca2b0e69b89d544ea028 (diff) | |
| download | nixpkgs-c762b1eaab5c0ea237faf775c2c382f8508b8018.tar nixpkgs-c762b1eaab5c0ea237faf775c2c382f8508b8018.tar.gz nixpkgs-c762b1eaab5c0ea237faf775c2c382f8508b8018.tar.bz2 nixpkgs-c762b1eaab5c0ea237faf775c2c382f8508b8018.tar.lz nixpkgs-c762b1eaab5c0ea237faf775c2c382f8508b8018.tar.xz nixpkgs-c762b1eaab5c0ea237faf775c2c382f8508b8018.tar.zst nixpkgs-c762b1eaab5c0ea237faf775c2c382f8508b8018.zip | |
Merge pull request #90065 from wizeman/u/fix-config-merge
linux: make sure all config options have the same value
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index b72809918b4..5e749ed3fcf 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -193,16 +193,17 @@ let NET_DROP_MONITOR = yes; # needed for ss - INET_DIAG = module; - INET_TCP_DIAG = module; - INET_UDP_DIAG = module; - INET_RAW_DIAG = whenAtLeast "4.14" module; - INET_DIAG_DESTROY = whenAtLeast "4.9" yes; + # Use a lower priority to allow these options to be overridden in hardened/config.nix + INET_DIAG = mkDefault module; + INET_TCP_DIAG = mkDefault module; + INET_UDP_DIAG = mkDefault module; + INET_RAW_DIAG = whenAtLeast "4.14" (mkDefault module); + INET_DIAG_DESTROY = whenAtLeast "4.9" (mkDefault yes); # enable multipath-tcp MPTCP = whenAtLeast "5.6" yes; MPTCP_IPV6 = whenAtLeast "5.6" yes; - INET_MPTCP_DIAG = whenAtLeast "5.9" module; + INET_MPTCP_DIAG = whenAtLeast "5.9" (mkDefault module); }; wireless = { |