diff options
| author | Robin Gloster <mail@glob.in> | 2019-09-25 11:28:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 11:28:20 +0200 |
| commit | 68b42a84fdd167e358ec9f76c40ff3907d0c3c2e (patch) | |
| tree | 1a54ec197e8e7d73be867bebf6e79c6a89d5af9d /nixos/modules/tasks/network-interfaces-systemd.nix | |
| parent | 5ee383ea8c31cd7c8489c2b076aac9c51f63b55c (diff) | |
| parent | fb6595eafdb90ef0bc7a31c2bfc9204e4cad11d9 (diff) | |
| download | nixpkgs-68b42a84fdd167e358ec9f76c40ff3907d0c3c2e.tar nixpkgs-68b42a84fdd167e358ec9f76c40ff3907d0c3c2e.tar.gz nixpkgs-68b42a84fdd167e358ec9f76c40ff3907d0c3c2e.tar.bz2 nixpkgs-68b42a84fdd167e358ec9f76c40ff3907d0c3c2e.tar.lz nixpkgs-68b42a84fdd167e358ec9f76c40ff3907d0c3c2e.tar.xz nixpkgs-68b42a84fdd167e358ec9f76c40ff3907d0c3c2e.tar.zst nixpkgs-68b42a84fdd167e358ec9f76c40ff3907d0c3c2e.zip | |
Merge branch 'master' into networkd-disallow-dhcp
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 605d00de58f..863072e33dc 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -12,7 +12,7 @@ let i.ipv4.addresses ++ optionals cfg.enableIPv6 i.ipv6.addresses; - dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "no"; + dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "yes" else "no"; slaves = concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds)) |