diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-12-01 17:49:00 +0100 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2017-11-12 14:38:45 -0500 |
| commit | 7fea3bfeb4fcb50efc9d79018b1cae0d3f2dec08 (patch) | |
| tree | 918373bb79afd5a24f9f4ecbff6b3556e293736c /debian/rules | |
| parent | 773fa460187c30b4d4f9271b075a92dadb57c1fb (diff) | |
Re-drop dnsmasq in zesty, in favor of systemd-resolved
But don't Recommend libnss-resolve, because the local resolver + libnss_dns.so should suffice for all uses and the resolved nss module is unnecessary added complexity. We need to specify "dns=systemd-resolved" as for the time being our /etc/resolv.conf points to resolvconf's generated file instead of systemd-resolved's, so the auto-detection does not work. Do that in a separate conf.d file in /usr to avoid unnecessary conffile prompts in the future. The user can still override it in /etc.
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules index 3db9ad5e..b35514e1 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ override_dh_auto_configure: --runstatedir=/run \ --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 \ |