mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 23:52:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

linux: remove canDisableNetfilterConntrackHelpers feature

Browse Source 
This feature is available in all kernels in nixpkgs.
This commit is contained in:
Franz Pletz 2017-01-22 17:09:24 +01:00
parent 4a914f2f9f
commit 403fdd737e
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
13 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/networking/firewall.nix
View File

@ -41,7 +41,6 @@ let
kernelPackages = config.boot.kernelPackages;
kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false;
kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false;
helpers =
''
@ -512,8 +511,6 @@ in
assertions = [ { assertion = (cfg.checkReversePath != false) || kernelHasRPFilter;
message = "This kernel does not support rpfilter"; }
{ assertion = cfg.autoLoadConntrackHelpers || kernelCanDisableHelpers;
message = "This kernel does not support disabling conntrack helpers"; }
];
systemd.services.firewall = {

1
pkgs/os-specific/linux/kernel/linux-3.10.nix
View File

@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
})

1
pkgs/os-specific/linux/kernel/linux-3.12.nix
View File

@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
})

1
pkgs/os-specific/linux/kernel/linux-3.18.nix
View File

@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

1
pkgs/os-specific/linux/kernel/linux-4.1.nix
View File

@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

1
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

1
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

1
pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
View File

@ -16,7 +16,6 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
features.chromiumos = true;
} // (args.argsOverride or {}))

3
pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
View File

@ -16,9 +16,8 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
features.chromiumos = true;
extraMeta.hydraPlatforms = [];
} // (args.argsOverride or {}))

1
pkgs/os-specific/linux/kernel/linux-grsecurity.nix
View File

@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

1
pkgs/os-specific/linux/kernel/linux-mptcp.nix
View File

@ -46,6 +46,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

1
pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@ -17,7 +17,6 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
features.iwlwifi = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
extraMeta.hydraPlatforms = [];

1
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -13,7 +13,6 @@ import ./generic.nix (args // rec {
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
# Should the testing kernels ever be built on Hydra?