about summary refs log tree commit diff
path: root/debian/control
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-12-01 17:49:00 +0100
committerJeremy Bicha <jbicha@ubuntu.com>2017-11-12 14:38:45 -0500
commit7fea3bfeb4fcb50efc9d79018b1cae0d3f2dec08 (patch)
tree918373bb79afd5a24f9f4ecbff6b3556e293736c /debian/control
parent773fa460187c30b4d4f9271b075a92dadb57c1fb (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/control')
-rw-r--r--debian/control4
1 files changed, 0 insertions, 4 deletions
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