Merge branch 'master' into networkd-disallow-dhcp

2019-09-25 11:28:20 +02:00
parent 5ee383ea8c fb6595eafd
commit 68b42a84fd
60 changed files with 1694 additions and 4573 deletions
--- 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))