Merge pull request #93893 from charvp/fix-networking-macvlan

nixos/tests/networking: fix macvlan tests
This commit is contained in:
Martin Weinelt 2020-07-26 13:16:57 +02:00 committed by GitHub
commit 9bd0df3ad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,14 +32,14 @@ let
services.dhcpd4 = {
enable = true;
interfaces = map (n: "eth${toString n}") vlanIfs;
extraConfig = ''
'' + flip concatMapStrings vlanIfs (n: ''
extraConfig = flip concatMapStrings vlanIfs (n: ''
subnet 192.168.${toString n}.0 netmask 255.255.255.0 {
option routers 192.168.${toString n}.1;
range 192.168.${toString n}.2 192.168.${toString n}.254;
}
'')
;
machines = lib.flip map vlanIfs (vlan:
machines = flip map vlanIfs (vlan:
{
hostName = "client${toString vlan}";
ethernetAddress = qemu-flags.qemuNicMac vlan 1;