summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-07-13 14:35:23 +0100
committerGitHub <noreply@github.com>2017-07-13 14:35:23 +0100
commitb14bcd873a193059223580d9cff1704788b33758 (patch)
treed35bc7e13c21480ff6e0ba2bae5c9ec57b66ebcb /nixos/modules/system
parent3ae2158bae205df10dcbba6a5a4bd9b4f5169a80 (diff)
parentcd8a1a7ceb373a3bcf7894827a6e2e6bf39d0295 (diff)
downloadnixpkgs-b14bcd873a193059223580d9cff1704788b33758.tar
nixpkgs-b14bcd873a193059223580d9cff1704788b33758.tar.gz
nixpkgs-b14bcd873a193059223580d9cff1704788b33758.tar.bz2
nixpkgs-b14bcd873a193059223580d9cff1704788b33758.tar.lz
nixpkgs-b14bcd873a193059223580d9cff1704788b33758.tar.xz
nixpkgs-b14bcd873a193059223580d9cff1704788b33758.tar.zst
nixpkgs-b14bcd873a193059223580d9cff1704788b33758.zip
Merge pull request #27142 from florianjacob/resolved-multicastdns-support
networkd: Allow new MulticastDNS setting
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/networkd.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index f96dde15361..b151b568892 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -94,7 +94,7 @@ let
   checkNetwork = checkUnitConfig "Network" [
     (assertOnlyFields [
       "Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute"
-      "LLMNR" "Domains" "Bridge" "Bond"
+      "LLMNR" "MulticastDNS" "Domains" "Bridge" "Bond"
     ])
     (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"])
     (assertValueOneOf "DHCPServer" boolValues)
@@ -103,6 +103,7 @@ let
     (assertValueOneOf "IPv4LL" boolValues)
     (assertValueOneOf "IPv4LLRoute" boolValues)
     (assertValueOneOf "LLMNR" boolValues)
+    (assertValueOneOf "MulticastDNS" boolValues)
   ];
 
   checkAddress = checkUnitConfig "Address" [