diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-12-01 16:49:00 (GMT) |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-12-02 08:07:11 (GMT) |
| commit | 98974a882abfd60e5f3a72c87cd09dde71dcfcb8 (patch) | |
| tree | 2249a90bad80879e70400b5b48226640b86bd572 | |
| parent | b1c0547a5c054a78be70e8b8fc98aabcca27b546 (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.
LP: #1638836
| -rw-r--r-- | debian/10-dns-resolved.conf | 5 | ||||
| -rw-r--r-- | debian/NetworkManager.conf | 1 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/network-manager.install | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/debian/10-dns-resolved.conf b/debian/10-dns-resolved.conf new file mode 100644 index 0000000..9eeecce --- /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/NetworkManager.conf b/debian/NetworkManager.conf index dd8ea65..d8b33d9 100644 --- a/debian/NetworkManager.conf +++ b/debian/NetworkManager.conf @@ -1,6 +1,5 @@ [main] plugins=ifupdown,keyfile -dns=dnsmasq [ifupdown] managed=false diff --git a/debian/control b/debian/control index 0b3cb62..f1798bb 100644 --- a/debian/control +++ b/debian/control @@ -61,7 +61,6 @@ Depends: ${shlibs:Depends}, isc-dhcp-client (>= 4.3.1-5ubuntu1), libpam-systemd, policykit-1, - dnsmasq-base, Recommends: ppp (>= 2.4.6), iptables, modemmanager, diff --git a/debian/network-manager.install b/debian/network-manager.install index df990cd..5063111 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -25,6 +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-globally-managed-devices.conf usr/lib/NetworkManager/conf.d/ +debian/10-*.conf usr/lib/NetworkManager/conf.d/ debian/60-network-manager.rules usr/share/polkit-1/rules.d/ debian/source_network-manager.py /usr/share/apport/package-hooks/ |