Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3ae2158bae20
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b14bcd873a19
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 5, 2017

  1. networkd: Allow new MulticastDNS setting 

    which gained an implementation in systemd v233
    @florianjacob
    florianjacob committed Jul 5, 2017
    Copy the full SHA
    cd8a1a7 View commit details

Commits on Jul 13, 2017

  1. Merge pull request #27142 from florianjacob/resolved-multicastdns-sup… 

    …port

networkd: Allow new MulticastDNS setting
    @Mic92
    Mic92 authored Jul 13, 2017
    Copy the full SHA
    b14bcd8 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 nixos/modules/system/boot/networkd.nix
3 changes: 2 additions & 1 deletion nixos/modules/system/boot/networkd.nix
View file
Original file line number Diff line number Diff line change
@@ -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" [