diff options
author | Thomas Haller <thaller@redhat.com> | 2018-03-09 18:43:53 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-03-20 21:02:52 +0100 |
commit | 454195c09db12413c7feab4cf29e67ec5c1cd528 (patch) | |
tree | 8c8e216b702595151a9d719cf4560b5aa1d2d308 /src/nm-iface-helper.c | |
parent | 453f9e5140481819d851c97f179c3c36142cf295 (diff) | |
download | NetworkManager-454195c09db12413c7feab4cf29e67ec5c1cd528.tar.gz |
device: don't capture resolve.conf for initial device config
This was called by via
...
- manager:recheck_assume_connection()
- manager:get_existing_connection()
- nm_device_capture_initial_config()
- update_ext_ip_config(initial=TRUE)
and would parse resolv.conf, and try to fill the device IP config
with nameservers and dns-options.
But why? It would only have effect if NM was started with
nm_dns_manager_get_resolv_conf_explicit(), but is that really sensible?
And it would only take effect on devices that have a default route.
And for what is this information even used?
Let's not do it this way. If we need this information for assuming or
external sys-iface mode, then it should be explicitly loaded at the
appropriate moment.
For now, drop it and see what breaks. Then we can fix it properly. If
it even matters.
Diffstat (limited to 'src/nm-iface-helper.c')
-rw-r--r-- | src/nm-iface-helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index c85a054ae9..601c72acac 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -125,7 +125,7 @@ dhcp4_state_changed (NMDhcpClient *client, g_assert (nm_ip4_config_get_ifindex (ip4_config) == gl.ifindex); existing = nm_ip4_config_capture (nm_platform_get_multi_idx (NM_PLATFORM_GET), - NM_PLATFORM_GET, gl.ifindex, FALSE); + NM_PLATFORM_GET, gl.ifindex); if (last_config) nm_ip4_config_subtract (existing, last_config, 0); @@ -171,7 +171,7 @@ ndisc_config_changed (NMNDisc *ndisc, const NMNDiscData *rdata, guint changed_in NMIP6Config *existing; existing = nm_ip6_config_capture (nm_platform_get_multi_idx (NM_PLATFORM_GET), - NM_PLATFORM_GET, gl.ifindex, FALSE, global_opt.tempaddr); + NM_PLATFORM_GET, gl.ifindex, global_opt.tempaddr); if (ndisc_config) nm_ip6_config_subtract (existing, ndisc_config, 0); else { |