alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #27143 from florianjacob/networkmanager-support-resolved

Browse source 
networkmanager service: use resolved if enabled
This commit is contained in:
Michael Raskin 2017-07-08 22:34:09 +02:00 committed by GitHub
parent 980346592c 12f54a5746
commit 0d2d5e2147
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/networking/networkmanager.nix
View file

@ -9,11 +9,16 @@ let
# /var/lib/misc is for dnsmasq.leases.
stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc";
dns =
if cfg.useDnsmasq then "dnsmasq"
else if config.services.resolved.enable then "systemd-resolved"
else "default";
configFile = writeText "NetworkManager.conf" ''
[main]
plugins=keyfile
dhcp=${cfg.dhcp}
dns=${if cfg.useDnsmasq then "dnsmasq" else "default"}
dns=${dns}
[keyfile]
${optionalString (cfg.unmanaged != [])