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/network-manager.install | |
| 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/network-manager.install')
| -rw-r--r-- | debian/network-manager.install | 1 |
1 files changed, 1 insertions, 0 deletions
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/ |