linux: remove canDisableNetfilterConntrackHelpers feature

This feature is available in all kernels in nixpkgs.
This commit is contained in:
Franz Pletz
2017-01-25 00:28:55 +01:00
parent 4a914f2f9f
commit 403fdd737e
13 changed files with 1 additions and 16 deletions
@@ -41,7 +41,6 @@ let
kernelPackages = config.boot.kernelPackages; kernelPackages = config.boot.kernelPackages;
kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false; kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false;
kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false;
helpers = helpers =
'' ''
@@ -512,8 +511,6 @@ in
assertions = [ { assertion = (cfg.checkReversePath != false) || kernelHasRPFilter; assertions = [ { assertion = (cfg.checkReversePath != false) || kernelHasRPFilter;
message = "This kernel does not support rpfilter"; } message = "This kernel does not support rpfilter"; }
{ assertion = cfg.autoLoadConntrackHelpers || kernelCanDisableHelpers;
message = "This kernel does not support disabling conntrack helpers"; }
]; ];
systemd.services.firewall = { systemd.services.firewall = {
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
}) })
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
}) })
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
} // (args.argsOverride or {})) } // (args.argsOverride or {}))
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
} // (args.argsOverride or {})) } // (args.argsOverride or {}))
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
} // (args.argsOverride or {})) } // (args.argsOverride or {}))
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
} // (args.argsOverride or {})) } // (args.argsOverride or {}))
@@ -16,7 +16,6 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
features.chromiumos = true; features.chromiumos = true;
} // (args.argsOverride or {})) } // (args.argsOverride or {}))
@@ -16,7 +16,6 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
features.chromiumos = true; features.chromiumos = true;
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
} // (args.argsOverride or {})) } // (args.argsOverride or {}))
@@ -46,6 +46,5 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
} // (args.argsOverride or {})) } // (args.argsOverride or {}))
@@ -17,7 +17,6 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
extraMeta.hydraPlatforms = []; extraMeta.hydraPlatforms = [];
@@ -13,7 +13,6 @@ import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
# Should the testing kernels ever be built on Hydra? # Should the testing kernels ever be built on Hydra?