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

networkmanager service: use resolved if enabled
This commit is contained in:
Michael Raskin
2017-07-08 22:34:09 +02:00
committed by GitHub

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 != [])