movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 12:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into networkd-disallow-dhcp

Browse source
This commit is contained in:
Robin Gloster 2019-09-25 11:28:20 +02:00 • committed by GitHub
commit 68b42a84fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 1694 additions and 4573 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/tasks/network-interfaces-systemd.nix
View file

@ -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))