diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-22 06:01:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-22 06:01:28 +0000 |
| commit | bc45bc6d10b955ac3f3640d7c875e2912a61cab1 (patch) | |
| tree | bd2408e348d4b659b0808fdeb284b9b0686dbc06 /nixos/modules | |
| parent | 1ca0ba653f2fa006b3b8cfa2abd2ef2f7f3201b4 (diff) | |
| parent | fc6511e3c38955d93aab4def776a718477f02668 (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/tasks/network-interfaces-systemd.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 645ff161cddd8..8a5e1b5af114c 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -92,7 +92,7 @@ in }; }; }); - networks."40-${i.name}" = mkMerge [ (genericNetwork mkDefault) { + networks."40-${i.name}" = mkMerge [ (genericNetwork id) { name = mkDefault i.name; DHCP = mkForce (dhcpStr (if i.useDHCP != null then i.useDHCP else false)); |