summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-12-02 08:10:48 (GMT)
committerMartin Pitt <martin.pitt@ubuntu.com>2016-12-02 08:32:09 (GMT)
commit47c16e590ccfbb1a9553e18a089326d91a4719ea (patch)
treeac220288e868505b5c5203d76151dd8f95c3745a
parent98974a882abfd60e5f3a72c87cd09dde71dcfcb8 (diff)
Disable resolvconf supportresolved
This is broken with DNS plugins other than "dnsmasq" -- it still writes 127.0.1.1 into resolvconf as a nameserver, but this does not exist any more and will also shadow resolved's stub server on 127.0.0.53. This ought to be fixed more properly in the future.
-rwxr-xr-xdebian/rules2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules
index 3ff3684..5bda943 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_configure:
--libexecdir=/usr/lib/NetworkManager \
--with-pppd-plugin-dir=$(PPPD_PLUGIN_DIR) \
--with-pppd=/usr/sbin/pppd \
- --with-resolvconf=/sbin/resolvconf \
+ --with-resolvconf=no \
--with-dhclient=/sbin/dhclient \
--with-iptables=/sbin/iptables \
--with-dnsmasq=/usr/sbin/dnsmasq \