Unverified Commit 3d1fe144 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #279433 from wentasah/nsswitch-mdns 

nixos/avahi-daemon: let nssmdns{4,6} options affect also non-minimal …
parents 7bbf7ba4 e23da86b

nixos/modules/services/networking/avahi-daemon.nix

+6 −6
Original line number Diff line number Diff line
@@ -273,17 +273,17 @@ in 


    system.nssModules = optional (cfg.nssmdns4 || cfg.nssmdns6) pkgs.nssmdns;

    system.nssDatabases.hosts = let

      mdnsMinimal = if (cfg.nssmdns4 && cfg.nssmdns6) then

        "mdns_minimal"

      mdns = if (cfg.nssmdns4 && cfg.nssmdns6) then

        "mdns"

      else if (!cfg.nssmdns4 && cfg.nssmdns6) then

        "mdns6_minimal"

        "mdns6"

      else if (cfg.nssmdns4 && !cfg.nssmdns6) then

        "mdns4_minimal"

        "mdns4"

      else

        "";

    in optionals (cfg.nssmdns4 || cfg.nssmdns6) (mkMerge [

      (mkBefore [ "${mdnsMinimal} [NOTFOUND=return]" ]) # before resolve

      (mkAfter [ "mdns" ]) # after dns

      (mkBefore [ "${mdns}_minimal [NOTFOUND=return]" ]) # before resolve

      (mkAfter [ "${mdns}" ]) # after dns

    ]);



    environment.systemPackages = [ cfg.package ];