diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2023-10-14 20:47:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-14 20:47:36 +0200 |
| commit | 632cfff25741c2cff9d22164bcb141cb7ca6f7af (patch) | |
| tree | dab3e858644146e2c3b91973526e0b5f1526ef23 /nixos/modules/tasks/network-interfaces-systemd.nix | |
| parent | 050726bf76a666731c8116b555b1ef88f65865da (diff) | |
| parent | c4228b6c8f662a3e3022c187ec40f4debafbd454 (diff) | |
| download | nixpkgs-632cfff25741c2cff9d22164bcb141cb7ca6f7af.tar nixpkgs-632cfff25741c2cff9d22164bcb141cb7ca6f7af.tar.gz nixpkgs-632cfff25741c2cff9d22164bcb141cb7ca6f7af.tar.bz2 nixpkgs-632cfff25741c2cff9d22164bcb141cb7ca6f7af.tar.lz nixpkgs-632cfff25741c2cff9d22164bcb141cb7ca6f7af.tar.xz nixpkgs-632cfff25741c2cff9d22164bcb141cb7ca6f7af.tar.zst nixpkgs-632cfff25741c2cff9d22164bcb141cb7ca6f7af.zip | |
Merge pull request #259619 from Majiir/fix-networkd-dhcp
nixos/network-interfaces-systemd: fix DHCP setting
Diffstat (limited to 'nixos/modules/tasks/network-interfaces-systemd.nix')
| -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 53097e21c64..6912f671216 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -89,7 +89,7 @@ let networks."40-${i.name}" = mkMerge [ (genericNetwork id) { name = mkDefault i.name; DHCP = mkForce (dhcpStr - (if i.useDHCP != null then i.useDHCP else false)); + (if i.useDHCP != null then i.useDHCP else (config.networking.useDHCP && i.ipv4.addresses == [ ]))); address = forEach (interfaceIps i) (ip: "${ip.address}/${toString ip.prefixLength}"); routes = forEach (interfaceRoutes i) |