diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2018-10-12 13:38:58 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2018-10-12 13:38:58 +0100 |
| commit | d04f89206de51124eb9cf451e7c616957261e87f (patch) | |
| tree | 6ebd202dc6e168bdff96a525c17d33e66160c467 | |
| parent | a5a93f6ca219cb51db5b5ae853e703c53163b8e5 (diff) | |
| parent | 205aa893ad39d564940d9cf17f5959ef97f9eaab (diff) | |
| download | mullvadvpn-d04f89206de51124eb9cf451e7c616957261e87f.tar.xz mullvadvpn-d04f89206de51124eb9cf451e7c616957261e87f.zip | |
Merge branch 'linux-reorder-preference-of-dns-managers'
| -rw-r--r-- | talpid-core/src/security/linux/dns/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/talpid-core/src/security/linux/dns/mod.rs b/talpid-core/src/security/linux/dns/mod.rs index 0ab82c5d15..25a9a5926d 100644 --- a/talpid-core/src/security/linux/dns/mod.rs +++ b/talpid-core/src/security/linux/dns/mod.rs @@ -64,9 +64,9 @@ impl DnsSettings { } fn with_detected_dns_manager() -> Result<Self> { - NetworkManager::new() - .map(DnsSettings::NetworkManager) - .or_else(|_| SystemdResolved::new().map(DnsSettings::SystemdResolved)) + SystemdResolved::new() + .map(DnsSettings::SystemdResolved) + .or_else(|_| NetworkManager::new().map(DnsSettings::NetworkManager)) .or_else(|_| Resolvconf::new().map(DnsSettings::Resolvconf)) .or_else(|_| StaticResolvConf::new().map(DnsSettings::StaticResolvConf)) .chain_err(|| ErrorKind::NoDnsSettingsManager) |