diff options
| author | Peter Simons <simons@cryp.to> | 2011-09-14 18:20:50 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-09-14 18:20:50 +0000 |
| commit | eb6e1310b8774f3aed4c5675d09708f0df6199d3 (patch) | |
| tree | 3297542b3cda78d38731abb65837f4553cd377a9 /modules/tasks/network-interfaces.nix | |
| parent | f5e8d35f8e76755febf97ca8f62b0700a8b6d20a (diff) | |
| download | nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.gz nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.bz2 nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.lz nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.xz nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.zst nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.zip | |
strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
Diffstat (limited to 'modules/tasks/network-interfaces.nix')
| -rw-r--r-- | modules/tasks/network-interfaces.nix | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix index fab61b79c98..f3603127b26 100644 --- a/modules/tasks/network-interfaces.nix +++ b/modules/tasks/network-interfaces.nix @@ -6,7 +6,7 @@ let cfg = config.networking; -in +in { @@ -120,7 +120,7 @@ in }; }; - + }; networking.ifaces = mkOption { @@ -132,7 +132,7 @@ in as an attribute set keyed on the interface name. ''; }; - + networking.bridges = mkOption { default = { }; example = @@ -160,7 +160,7 @@ in }; }; - + }; }; @@ -179,13 +179,13 @@ in pkgs.nettools pkgs.wirelesstools pkgs.rfkill - ] + ] ++ optional (cfg.bridges != {}) pkgs.bridge_utils ++ optional cfg.enableIPv6 pkgs.ndisc6; security.setuidPrograms = [ "ping" "ping6" ]; - - jobs.networkInterfaces = + + jobs.networkInterfaces = { name = "network-interfaces"; startOn = "stopped udevtrigger"; @@ -195,7 +195,7 @@ in preStart = '' set +e # continue in case of errors - + ${flip concatMapStrings cfg.interfaces (i: optionalString (i.macAddress != "") '' @@ -213,7 +213,7 @@ in ${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}" @@ -226,11 +226,11 @@ in ${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 != "") @@ -276,5 +276,5 @@ in ''; }; - + } |