public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/networking-interfaces: rename IP addresses/routes options

Browse Source
This commit is contained in:
rnhmjoj
2018-02-17 14:01:24 +01:00
parent f41111c4da
commit c1bed05e34
8 changed files with 72 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/tasks/network-interfaces-systemd.nix
+2 -8
View File
@@ -9,14 +9,8 @@ let
interfaces = attrValues cfg.interfaces;
interfaceIps = i:
i.ip4 ++ optionals cfg.enableIPv6 i.ip6
++ optional (i.ipAddress != null) {
address = i.ipAddress;
prefixLength = i.prefixLength;
} ++ optional (cfg.enableIPv6 && i.ipv6Address != null) {
address = i.ipv6Address;
prefixLength = i.ipv6PrefixLength;
};
i.ipv4.addresses
++ optionals cfg.enableIPv6 i.ipv6.addresses;
dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "none";