diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-11-27 22:53:50 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-11-27 22:54:01 -0800 |
| commit | 299b59d1c494d1f6bea3c72a2e163cbc4b5916ac (patch) | |
| tree | 6386d239a219a2a8fece649caffdde11faed955e /nixos/modules | |
| parent | fbe9ac05d36380159a80bb98307246323aea422c (diff) | |
| download | nixlib-299b59d1c494d1f6bea3c72a2e163cbc4b5916ac.tar nixlib-299b59d1c494d1f6bea3c72a2e163cbc4b5916ac.tar.gz nixlib-299b59d1c494d1f6bea3c72a2e163cbc4b5916ac.tar.bz2 nixlib-299b59d1c494d1f6bea3c72a2e163cbc4b5916ac.tar.lz nixlib-299b59d1c494d1f6bea3c72a2e163cbc4b5916ac.tar.xz nixlib-299b59d1c494d1f6bea3c72a2e163cbc4b5916ac.tar.zst nixlib-299b59d1c494d1f6bea3c72a2e163cbc4b5916ac.zip | |
nixos/network-interfaces: More fixes
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/tasks/network-interfaces-scripted.nix | 6 | ||||
| -rw-r--r-- | 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; |