diff options
| author | Florian Klink <flokli@flokli.de> | 2024-01-11 13:21:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-11 13:21:24 +0200 |
| commit | 3d1fe1445ce13dd6e5397d75b590e90e5830081f (patch) | |
| tree | 0fbb68c83e98e21df5cd22401dc4e8f4843d0eb1 /nixos | |
| parent | 7bbf7ba40498334df876bc8750c28d32460caed2 (diff) | |
| parent | e23da86b18bd271c323d9f0e0621355cf7f67ea8 (diff) | |
Merge pull request #279433 from wentasah/nsswitch-mdns
nixos/avahi-daemon: let nssmdns{4,6} options affect also non-minimal …Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/avahi-daemon.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 08fc092e230c0..782681018116c 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -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 ]; |