diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-08-31 10:58:54 +0200 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-08-31 10:58:54 +0200 |
| commit | ea8910652fcecbcd4f21aa1c66b1a0a239408b04 (patch) | |
| tree | 539cd8cdd81d4edad720d7d4de6f927d82f5107c /nixos/lib/build-vms.nix | |
| parent | 2f697bf6931b24cdd428e22effbf6427a85afd42 (diff) | |
| download | nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.gz nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.bz2 nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.lz nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.xz nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.tar.zst nixpkgs-ea8910652fcecbcd4f21aa1c66b1a0a239408b04.zip | |
Revert "Merge pull request #3182 from wkennington/master.ipv6"
This reverts commit b23fd6585481a42937e105d5fce630a549900e86, reversing changes made to 43654cba2c280ce17b81db44993d1c1bcae3a9c6.
Diffstat (limited to 'nixos/lib/build-vms.nix')
| -rw-r--r-- | nixos/lib/build-vms.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index ba189555409..498c0a37783 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -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 |