From 299b59d1c494d1f6bea3c72a2e163cbc4b5916ac Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 27 Nov 2014 22:53:50 -0800
Subject: [PATCH] nixos/network-interfaces: More fixes

---
 nixos/modules/tasks/network-interfaces-scripted.nix | 6 +-----
 nixos/modules/tasks/network-interfaces.nix          | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index cfa36ba23423..30fcb3a80104 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -197,10 +197,6 @@ in
               echo "Adding bridge ${n}..."
               ip link add name "${n}" type bridge
 
-              # Set bridge's hello time to 0 to avoid startup delays.
-              echo 0 >"/sys/class/net/${n}/bridge/hello_time"
-              echo 0 >"/sys/class/net/${n}/bridge/forward_delay"
-
               # Enslave child interfaces
               ${flip concatMapStrings v.interfaces (i: ''
                 ip link set "${i}" master "${n}"
@@ -226,7 +222,7 @@ in
             before = [ "${n}-cfg.service" ];
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
-            path = [ pkgs.iproute ];
+            path = [ pkgs.iproute pkgs.gawk ];
             script = ''
               echo "Destroying old bond ${n}..."
               ${destroyBond n}
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index f853d61cea46..0ee2c9d2d00d 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -678,6 +678,7 @@ in
         before = [ "network-interfaces.target" ];
         bindsTo = [ (subsystemDevice i.name) ];
         after = [ (subsystemDevice i.name) ];
+        path = [ pkgs.iproute ];
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;