swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

systemd-resolved: fix case when dnsmasq is used as local resolver

Browse source 
fixes #25706
This commit is contained in:
Jörg Thalheim 2017-05-31 22:34:06 +01:00
parent 5604dbe878
commit 859267f627
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/config/networking.nix
View file

@ -222,13 +222,11 @@ in
'' + cfg.extraResolvconfConf + '' '' + cfg.extraResolvconfConf + ''
''; '';
} // (optionalAttrs config.services.resolved.enable ( } // optionalAttrs config.services.resolved.enable {
if dnsmasqResolve then {
"dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
} else {
"resolv.conf".source = "/run/systemd/resolve/resolv.conf"; "resolv.conf".source = "/run/systemd/resolve/resolv.conf";
} } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
)); "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
};
networking.proxy.envVars = networking.proxy.envVars =
optionalAttrs (cfg.proxy.default != null) { optionalAttrs (cfg.proxy.default != null) {