From 7fea3bfeb4fcb50efc9d79018b1cae0d3f2dec08 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 1 Dec 2016 17:49:00 +0100 Subject: 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. --- debian/10-dns-resolved.conf | 5 +++++ debian/control | 4 ---- debian/network-manager.install | 1 + debian/rules | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 debian/10-dns-resolved.conf diff --git a/debian/10-dns-resolved.conf b/debian/10-dns-resolved.conf new file mode 100644 index 00000000..9eeecce8 --- /dev/null +++ b/debian/10-dns-resolved.conf @@ -0,0 +1,5 @@ +[main] +# 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. +dns=systemd-resolved diff --git a/debian/control b/debian/control index fe6c5ba3..778b0af2 100644 --- a/debian/control +++ b/debian/control @@ -65,7 +65,6 @@ Depends: ${shlibs:Depends}, libpam-systemd, policykit-1 Recommends: ppp, - dnsmasq-base, iptables, modemmanager, crda, @@ -84,9 +83,6 @@ Description: network management framework (daemon and userspace tools) . Optional dependencies: * ppp: Required for establishing dial-up connections (e.g. via GSM). - * dnsmasq-base/iptables: Required for creating Ad-hoc connections and - connection sharing. - address configuration. Package: network-manager-dev Section: devel diff --git a/debian/network-manager.install b/debian/network-manager.install index 224a10b6..c4f76b28 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -25,5 +25,6 @@ lib/systemd/system/NetworkManager-dispatcher.service lib/systemd/system/NetworkManager-wait-online.service debian/NetworkManager.conf etc/NetworkManager/ debian/org.freedesktop.NetworkManager.pkla var/lib/polkit-1/localauthority/10-vendor.d/ +debian/10-*.conf usr/lib/NetworkManager/conf.d/ debian/60-network-manager.rules usr/share/polkit-1/rules.d/ debian/01-ifupdown etc/NetworkManager/dispatcher.d/ 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 \ -- cgit 1.3.0-6-gf8a5