diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-09-07 07:44:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 07:44:58 +0000 |
| commit | 48f2b0c909f6f490c81b4cee6264d87b988a3a6e (patch) | |
| tree | 49fcf99585f49bcc0bb37b0b5aa878d570920d6b /nixos | |
| parent | 427e4910ec670a7c4f70bb0632933a86d089e0e7 (diff) | |
| parent | ecf73103abf1897a3121de2c7e87490b437266aa (diff) | |
| download | nixlib-48f2b0c909f6f490c81b4cee6264d87b988a3a6e.tar nixlib-48f2b0c909f6f490c81b4cee6264d87b988a3a6e.tar.gz nixlib-48f2b0c909f6f490c81b4cee6264d87b988a3a6e.tar.bz2 nixlib-48f2b0c909f6f490c81b4cee6264d87b988a3a6e.tar.lz nixlib-48f2b0c909f6f490c81b4cee6264d87b988a3a6e.tar.xz nixlib-48f2b0c909f6f490c81b4cee6264d87b988a3a6e.tar.zst nixlib-48f2b0c909f6f490c81b4cee6264d87b988a3a6e.zip | |
Merge pull request #46235 from alexshpilkin/networkd-link-multicast
nixos/networkd: support MULTICAST, fix RequiredForOnline and [Route]
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/networkd.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 4bacf0f126a4..63a6f7fbe099 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -208,7 +208,6 @@ let "InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck" "MTUBytes" ]) - (assertHasField "Gateway") ]; checkDhcp = checkUnitConfig "DHCP" [ @@ -249,13 +248,14 @@ let # .network files have a [Link] section with different options than in .netlink files checkNetworkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "MACAddress" "MTUBytes" "ARP" "Unmanaged" "RequiredForOnline" + "MACAddress" "MTUBytes" "ARP" "Multicast" "Unmanaged" "RequiredForOnline" ]) (assertMacAddress "MACAddress") (assertByteFormat "MTUBytes") (assertValueOneOf "ARP" boolValues) + (assertValueOneOf "Multicast" boolValues) (assertValueOneOf "Unmanaged" boolValues) - (assertValueOneOf "RquiredForOnline" boolValues) + (assertValueOneOf "RequiredForOnline" boolValues) ]; |