about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathijs Kwik <mathijs@bluescreen303.nl>2012-10-12 12:56:46 +0200
committerMathijs Kwik <mathijs@bluescreen303.nl>2012-10-13 12:22:47 +0200
commit5711282fd8b9f536b261018529e9d7d17ff63329 (patch)
tree30c37794101a43b22754ab6d38a5d45f7978a4a3
parent8ea81050717e22847b8045a8017f654c11250fd1 (diff)
downloadnixlib-5711282fd8b9f536b261018529e9d7d17ff63329.tar
nixlib-5711282fd8b9f536b261018529e9d7d17ff63329.tar.gz
nixlib-5711282fd8b9f536b261018529e9d7d17ff63329.tar.bz2
nixlib-5711282fd8b9f536b261018529e9d7d17ff63329.tar.lz
nixlib-5711282fd8b9f536b261018529e9d7d17ff63329.tar.xz
nixlib-5711282fd8b9f536b261018529e9d7d17ff63329.tar.zst
nixlib-5711282fd8b9f536b261018529e9d7d17ff63329.zip
linux kernels: mark kernels that can disable the conntrack-helper
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.5.nix1
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.6.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix
index 42456a8bdd9f..afcf73e0e355 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix
@@ -258,6 +258,7 @@ import ./generic.nix (
     features.iwlwifi = true;
     features.efiBootStub = true;
     features.needsCifsUtils = true;
+    features.canDisableNetfilterConntrackHelpers = true;
     features.netfilterRPFilter = true;
   }
 
diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix
index 66ca30a839c2..463833df358c 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix
@@ -262,6 +262,7 @@ import ./generic.nix (
     features.iwlwifi = true;
     features.efiBootStub = true;
     features.needsCifsUtils = true;
+    features.canDisableNetfilterConntrackHelpers = true;
     features.netfilterRPFilter = true;
   }