diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-08-18 08:31:29 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-08-18 08:31:29 -0400 |
| commit | b0887dd4d035acc0d84aa859748d36891548eaaf (patch) | |
| tree | c4dc0dae50954f3c8fb600aa9e7cfaabeb80deb0 /src/core/nm-policy.c | |
| parent | 1a62dcfdc0470be37743914da69fe0b0677c6bfb (diff) | |
| parent | 4741f1a52215c7ba466140912084d6906185bef3 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'src/core/nm-policy.c')
| -rw-r--r-- | src/core/nm-policy.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index 2d47772d..16b0211f 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -826,7 +826,7 @@ update_system_hostname(NMPolicy *self, const char *msg) && (nm_utils_is_specific_hostname(temp_hostname) || nm_utils_is_specific_hostname(priv->last_hostname))) { external_hostname = TRUE; - _LOGI(LOGD_DNS, + _LOGD(LOGD_DNS, "set-hostname: current hostname was changed outside NetworkManager: '%s'", temp_hostname); priv->dhcp_hostname = FALSE; @@ -2153,19 +2153,14 @@ device_l3cd_changed(NMDevice *device, nm_dns_manager_begin_updates(priv->dns_manager, __func__); - /* We catch already all the IP events registering on the device state changes but - * the ones where the IP changes with a stable state (i.e., activated): - * ignore IP config changes but when the device is in activated state. - * Prevents unnecessary changes to DNS information. - * FIXME(l3cfg): check why ^^^ this is needed and implement it. Note that - * this function is not always called when the device becomes ACTIVATED. - * Previously, we would also update the DNS manager's IP config in - * device_state_change(ACTIVATED). There we would also special-case - * pseudo-VPNs like wireguard. I don't see the code where this is handled - * now. + /* FIXME(l3cfg): Note that this function is not always called when the + * device becomes ACTIVATED. Previously, we would also update the DNS + * manager's IP config in device_state_change(ACTIVATED). There we would + * also special-case pseudo-VPNs like wireguard. I don't see the code where + * this is handled now. */ state = nm_device_get_state(device); - if (l3cd_new && state > NM_DEVICE_STATE_IP_CONFIG && state < NM_DEVICE_STATE_DEACTIVATING) { + if (l3cd_new && state >= NM_DEVICE_STATE_IP_CONFIG && state < NM_DEVICE_STATE_DEACTIVATING) { nm_dns_manager_set_ip_config(priv->dns_manager, AF_UNSPEC, device, |