public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Some hackery to make sure that router solicitations get through

Browse Source 
after creating a bridge.
* Ignore errors (set +e) so that we can get rid of all the "|| true"
  clauses.

svn path=/nixos/trunk/; revision=26660
This commit is contained in:
Eelco Dolstra 2011-04-01 15:05:42 +00:00
parent 817cc79cb5
commit 403accc71f
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,17 +194,19 @@ in
preStart = preStart =
'' ''
set +e # continue in case of errors
${flip concatMapStrings cfg.interfaces (i: ${flip concatMapStrings cfg.interfaces (i:
optionalString (i.macAddress != "") optionalString (i.macAddress != "")
'' ''
echo "Setting MAC address of ${i.name} to ${i.macAddress}..." echo "Setting MAC address of ${i.name} to ${i.macAddress}..."
ip link set "${i.name}" address "${i.macAddress}" || true ip link set "${i.name}" address "${i.macAddress}"
'') '')
} }
for i in $(cd /sys/class/net && ls -d *); do for i in $(cd /sys/class/net && ls -d *); do
echo "Bringing up network device $i..." echo "Bringing up network device $i..."
ip link set "$i" up || true ip link set "$i" up
done done
# Configure the manually specified interfaces. # Configure the manually specified interfaces.
@ -213,7 +215,7 @@ in
'' ''
echo "Configuring interface ${i.name}..." echo "Configuring interface ${i.name}..."
ip addr add "${i.ipAddress}""${optionalString (i.subnetMask != "") ("/" + i.subnetMask)}" \ ip addr add "${i.ipAddress}""${optionalString (i.subnetMask != "") ("/" + i.subnetMask)}" \
dev "${i.name}" || true dev "${i.name}"
'') '')
} }
@ -230,20 +232,30 @@ in
# Set the default gateway. # Set the default gateway.
${optionalString (cfg.defaultGateway != "") '' ${optionalString (cfg.defaultGateway != "") ''
ip route add default via "${cfg.defaultGateway}" || true ip route add default via "${cfg.defaultGateway}"
''} ''}
# Run any user-specified commands. # Run any user-specified commands.
${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands} || true ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands}
# Create bridge devices. # Create bridge devices.
${concatStrings (attrValues (flip mapAttrs cfg.bridges (n: v: '' ${concatStrings (attrValues (flip mapAttrs cfg.bridges (n: v: ''
echo "Creating bridge ${n}..." echo "Creating bridge ${n}..."
${pkgs.bridge_utils}/sbin/brctl addbr "${n}" || true ${pkgs.bridge_utils}/sbin/brctl addbr "${n}"
${flip concatMapStrings v.interfaces (i: '' ${flip concatMapStrings v.interfaces (i: ''
${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}" || true ${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}"
ip addr flush dev "${i}" || true 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 # !!! Should delete (brctl delif) any interfaces that
# no longer belong to the bridge. # no longer belong to the bridge.
'')))} '')))}