summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-09-11 17:55:08 -0300
committerEmīls Piņķis <emils@mullvad.net>2018-10-05 12:08:48 +0100
commit9745bbaed93e8b1239b8d8894142294d0f31ea45 (patch)
tree035f10bb1aa8d90365894be124f0495f0f6edf35
parent5def87ef0f3e51d48b2bc962a18776928850ac15 (diff)
downloadmullvadvpn-9745bbaed93e8b1239b8d8894142294d0f31ea45.tar.xz
mullvadvpn-9745bbaed93e8b1239b8d8894142294d0f31ea45.zip
Allow setting the DNS module through env. variable
-rw-r--r--README.md1
-rw-r--r--talpid-core/src/security/linux/dns/mod.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/README.md b/README.md
index bca0b9c3d4..8c9a35c418 100644
--- a/README.md
+++ b/README.md
@@ -145,6 +145,7 @@ sections.
choose a specific method:
* `"static-file"`: change the `/etc/resolv.conf` file directly
* `"resolvconf"`: use the `resolvconf` program
+ * `"systemd"`: use systemd's `resolved` service through DBus
## Building and running the Electron GUI app
diff --git a/talpid-core/src/security/linux/dns/mod.rs b/talpid-core/src/security/linux/dns/mod.rs
index 8c2ba57cbb..4205d9d957 100644
--- a/talpid-core/src/security/linux/dns/mod.rs
+++ b/talpid-core/src/security/linux/dns/mod.rs
@@ -36,6 +36,7 @@ impl DnsSettings {
Ok(match dns_module.as_ref().and_then(|value| value.to_str()) {
Some("static-file") => DnsSettings::StaticResolvConf(StaticResolvConf::new()?),
Some("resolvconf") => DnsSettings::Resolvconf(Resolvconf::new()?),
+ Some("systemd") => DnsSettings::SystemdResolved(SystemdResolved::new()?),
Some(_) | None => Self::with_detected_dns_manager()?,
})
}