diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-07-08 22:34:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-08 22:34:09 +0200 |
| commit | 0d2d5e214762d328015e613227f88bfcc2fe32e6 (patch) | |
| tree | 0af482f158d020f7cc2cba614a40aa531031e1da /nixos/modules/services | |
| parent | 980346592c07e565c90f947a68f4ea1a2f3e3dc2 (diff) | |
| parent | 12f54a57467acb9f3a44cd0959a4e32c591856e1 (diff) | |
| download | nixlib-0d2d5e214762d328015e613227f88bfcc2fe32e6.tar nixlib-0d2d5e214762d328015e613227f88bfcc2fe32e6.tar.gz nixlib-0d2d5e214762d328015e613227f88bfcc2fe32e6.tar.bz2 nixlib-0d2d5e214762d328015e613227f88bfcc2fe32e6.tar.lz nixlib-0d2d5e214762d328015e613227f88bfcc2fe32e6.tar.xz nixlib-0d2d5e214762d328015e613227f88bfcc2fe32e6.tar.zst nixlib-0d2d5e214762d328015e613227f88bfcc2fe32e6.zip | |
Merge pull request #27143 from florianjacob/networkmanager-support-resolved
networkmanager service: use resolved if enabled
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f1b3d298fecb..ab161b7e772c 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -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 != []) |