summary refs log tree commit diff
path: root/modules/services/networking/firewall.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-07-12 16:02:52 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-07-15 13:54:15 +0200
commit69eeb830394ab3059a66f876dd9ff92caa356bbd (patch)
treee17be7fc4a5965254a357245eb6b1d45912dfd86 /modules/services/networking/firewall.nix
parentab08c8a1bb745b71aabfc8f79f3882987c9f9811 (diff)
downloadnixpkgs-69eeb830394ab3059a66f876dd9ff92caa356bbd.tar
nixpkgs-69eeb830394ab3059a66f876dd9ff92caa356bbd.tar.gz
nixpkgs-69eeb830394ab3059a66f876dd9ff92caa356bbd.tar.bz2
nixpkgs-69eeb830394ab3059a66f876dd9ff92caa356bbd.tar.lz
nixpkgs-69eeb830394ab3059a66f876dd9ff92caa356bbd.tar.xz
nixpkgs-69eeb830394ab3059a66f876dd9ff92caa356bbd.tar.zst
nixpkgs-69eeb830394ab3059a66f876dd9ff92caa356bbd.zip
Use "or"
Diffstat (limited to 'modules/services/networking/firewall.nix')
-rw-r--r--modules/services/networking/firewall.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index c47210c7cef..40fbbabed3f 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -40,13 +40,9 @@ let
     '';
 
   kernelPackages = config.boot.kernelPackages;
-  kernelHasRPFilter = kernelPackages.kernel ? features
-                   && kernelPackages.kernel.features ? netfilterRPFilter
-                   && kernelPackages.kernel.features.netfilterRPFilter;
 
-  kernelCanDisableHelpers = kernelPackages.kernel ? features
-                   && kernelPackages.kernel.features ? canDisableNetfilterConntrackHelpers
-                   && kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers;
+  kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false;
+  kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false;
 
 in