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

Merge pull request #46235 from alexshpilkin/networkd-link-multicast

Browse Source 
nixos/networkd: support MULTICAST, fix RequiredForOnline and [Route]
This commit is contained in:
Franz Pletz 2018-09-07 07:44:58 +00:00 committed by GitHub
commit 48f2b0c909
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/system/boot/networkd.nix
View File

@ -208,7 +208,6 @@ let
"InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck" "InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck"
"MTUBytes" "MTUBytes"
]) ])
(assertHasField "Gateway")
]; ];
checkDhcp = checkUnitConfig "DHCP" [ checkDhcp = checkUnitConfig "DHCP" [
@ -249,13 +248,14 @@ let
# .network files have a [Link] section with different options than in .netlink files # .network files have a [Link] section with different options than in .netlink files
checkNetworkLink = checkUnitConfig "Link" [ checkNetworkLink = checkUnitConfig "Link" [
(assertOnlyFields [ (assertOnlyFields [
"MACAddress" "MTUBytes" "ARP" "Unmanaged" "RequiredForOnline" "MACAddress" "MTUBytes" "ARP" "Multicast" "Unmanaged" "RequiredForOnline"
]) ])
(assertMacAddress "MACAddress") (assertMacAddress "MACAddress")
(assertByteFormat "MTUBytes") (assertByteFormat "MTUBytes")
(assertValueOneOf "ARP" boolValues) (assertValueOneOf "ARP" boolValues)
(assertValueOneOf "Multicast" boolValues)
(assertValueOneOf "Unmanaged" boolValues) (assertValueOneOf "Unmanaged" boolValues)
(assertValueOneOf "RquiredForOnline" boolValues) (assertValueOneOf "RequiredForOnline" boolValues)
]; ];