diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-08-08 12:13:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-08 12:13:42 +0200 |
| commit | 29c3ea0cf0333fcff392e1866c10dfb1be245fef (patch) | |
| tree | 7ce8606257cf55d971feacb2f9d4516b84e1325a /nixos/modules/services/networking | |
| parent | a082215df55c1937fb5b0b7c91388702245f66a5 (diff) | |
| parent | da7755b75cd2cbcaf14b65b1a3e6b88cff1e0d04 (diff) | |
| download | nixlib-29c3ea0cf0333fcff392e1866c10dfb1be245fef.tar nixlib-29c3ea0cf0333fcff392e1866c10dfb1be245fef.tar.gz nixlib-29c3ea0cf0333fcff392e1866c10dfb1be245fef.tar.bz2 nixlib-29c3ea0cf0333fcff392e1866c10dfb1be245fef.tar.lz nixlib-29c3ea0cf0333fcff392e1866c10dfb1be245fef.tar.xz nixlib-29c3ea0cf0333fcff392e1866c10dfb1be245fef.tar.zst nixlib-29c3ea0cf0333fcff392e1866c10dfb1be245fef.zip | |
Merge pull request #27925 from adisbladis/networkmanager_unbound
networkmanager service: use unbound if enabled
Diffstat (limited to 'nixos/modules/services/networking')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index ab161b7e772c..2b7086afe7e8 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -12,6 +12,7 @@ let dns = if cfg.useDnsmasq then "dnsmasq" else if config.services.resolved.enable then "systemd-resolved" + else if config.services.unbound.enable then "unbound" else "default"; configFile = writeText "NetworkManager.conf" '' |