alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/network-interfaces: More fixes

Browse source
This commit is contained in:
William A. Kennington III 2014-11-27 22:53:50 -08:00
parent fbe9ac05d3
commit 299b59d1c4
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/tasks/network-interfaces-scripted.nix
View file

@ -197,10 +197,6 @@ in
echo "Adding bridge ${n}..." echo "Adding bridge ${n}..."
ip link add name "${n}" type bridge 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 # Enslave child interfaces
${flip concatMapStrings v.interfaces (i: '' ${flip concatMapStrings v.interfaces (i: ''
ip link set "${i}" master "${n}" ip link set "${i}" master "${n}"
@ -226,7 +222,7 @@ in
before = [ "${n}-cfg.service" ]; before = [ "${n}-cfg.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ]; path = [ pkgs.iproute pkgs.gawk ];
script = '' script = ''
echo "Destroying old bond ${n}..." echo "Destroying old bond ${n}..."
${destroyBond n} ${destroyBond n}

1
nixos/modules/tasks/network-interfaces.nix
View file

@ -678,6 +678,7 @@ in
before = [ "network-interfaces.target" ]; before = [ "network-interfaces.target" ];
bindsTo = [ (subsystemDevice i.name) ]; bindsTo = [ (subsystemDevice i.name) ];
after = [ (subsystemDevice i.name) ]; after = [ (subsystemDevice i.name) ];
path = [ pkgs.iproute ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;