summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-03-15 17:40:22 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-03-15 17:44:30 +0100
commitb250ac929075d4ea2b186046bf28e5519ca9faae (patch)
tree6c81f14e4dca056df44c84b55aa155186142e084 /nixos
parent8fed57e765bf751c01b3e6072e9e83f7079c82a9 (diff)
downloadnixpkgs-b250ac929075d4ea2b186046bf28e5519ca9faae.tar
nixpkgs-b250ac929075d4ea2b186046bf28e5519ca9faae.tar.gz
nixpkgs-b250ac929075d4ea2b186046bf28e5519ca9faae.tar.bz2
nixpkgs-b250ac929075d4ea2b186046bf28e5519ca9faae.tar.lz
nixpkgs-b250ac929075d4ea2b186046bf28e5519ca9faae.tar.xz
nixpkgs-b250ac929075d4ea2b186046bf28e5519ca9faae.tar.zst
nixpkgs-b250ac929075d4ea2b186046bf28e5519ca9faae.zip
Remove setting non-existent sysctl options
(cherry picked from commit 1010ced00c9b65eb7099d10f2ad8502c093655e4)
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/tasks/network-interfaces.nix2
1 files changed, 0 insertions, 2 deletions
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 503d3813611..0528012adfd 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -882,10 +882,8 @@ in
       optionalString hasBonds "options bonding max_bonds=0";
 
     boot.kernel.sysctl = {
-      "net.net.ipv4.conf.all.promote_secondaries" = true;
       "net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6);
       "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);
-      "net.ipv4.conf.all_forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
       "net.ipv6.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
     } // listToAttrs (concatLists (flip map (filter (i: i.proxyARP) interfaces)
         (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true))