ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-21 12:52:41 +03:00
Code Issues Projects Releases Wiki Activity

* Initialise bridges before doing the configuration specified in

Browse Source 
networking.interfaces and networking.localCommands.

svn path=/nixos/trunk/; revision=27505
This commit is contained in:
Eelco Dolstra 2011-06-20 18:12:47 +00:00
parent 3cb5ea79bd
commit 59355bafe5
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/tasks/network-interfaces.nix
View File

@ -209,6 +209,28 @@ in
ip link set "$i" up
done
# Create bridge devices.
${concatStrings (attrValues (flip mapAttrs cfg.bridges (n: v: ''
echo "Creating bridge ${n}..."
${pkgs.bridge_utils}/sbin/brctl addbr "${n}"
${flip concatMapStrings v.interfaces (i: ''
${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}"
ip addr flush dev "${i}"
'')}
# For some reason enslaving an interface to a bridge
# causes traffic to be blocked for a few seconds, long
# enough for IPv6 router solicitations to get lost.
# So increase the number of attemts.
${optionalString cfg.enableIPv6 ''
echo 5 > /proc/sys/net/ipv6/conf/${n}/router_solicitations
''}
# !!! Should delete (brctl delif) any interfaces that
# no longer belong to the bridge.
'')))}
# Configure the manually specified interfaces.
${flip concatMapStrings cfg.interfaces (i:
optionalString (i.ipAddress != "")
@ -238,28 +260,6 @@ in
# Run any user-specified commands.
${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands}
# Create bridge devices.
${concatStrings (attrValues (flip mapAttrs cfg.bridges (n: v: ''
echo "Creating bridge ${n}..."
${pkgs.bridge_utils}/sbin/brctl addbr "${n}"
${flip concatMapStrings v.interfaces (i: ''
${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}"
ip addr flush dev "${i}"
'')}
# For some reason enslaving an interface to a bridge
# causes traffic to be blocked for a few seconds, long
# enough for IPv6 router solicitations to get lost.
# So increase the number of attemts.
${optionalString cfg.enableIPv6 ''
echo 5 > /proc/sys/net/ipv6/conf/${n}/router_solicitations
''}
# !!! Should delete (brctl delif) any interfaces that
# no longer belong to the bridge.
'')))}
${optionalString (cfg.interfaces != [] || cfg.localCommands != "") ''
# Emit the ip-up event (e.g. to start ntpd).
initctl emit -n ip-up