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

Revert "Merge pull request #3182 from wkennington/master.ipv6"

Browse Source 
This reverts commit b23fd65854, reversing
changes made to 43654cba2c.
This commit is contained in:
Rob Vermaas
2014-08-31 10:58:54 +02:00
parent 2f697bf693
commit ea8910652f
7 changed files with 59 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/lib/build-vms.nix
View File

@@ -48,11 +48,10 @@ rec {
let
interfacesNumbered = zipTwoLists config.virtualisation.vlans (range 1 255);
interfaces = flip map interfacesNumbered ({ first, second }:
nameValuePair "eth${toString second}" { ip4 =
[ { address = "192.168.${toString first}.${toString m.second}";
prefixLength = 24;
} ];
}
nameValuePair "eth${toString second}"
{ ipAddress = "192.168.${toString first}.${toString m.second}";
subnetMask = "255.255.255.0";
});
in
{ key = "ip-address";
config =
@@ -61,7 +60,7 @@ rec {
networking.interfaces = listToAttrs interfaces;
networking.primaryIPAddress =
optionalString (interfaces != []) (head (head interfaces).value.ip4).address;
optionalString (interfaces != []) (head interfaces).value.ipAddress;
# Put the IP addresses of all VMs in this machine's
# /etc/hosts file. If a machine has multiple