Commit 64a9dd38 authored by Beniamino Galvani's avatar Beniamino Galvani

device: don't reapply IP config on link up for disconnected devices

Only reapply the IP configuration on link up if the IP state is CONF
or DONE. Previously we also reapplied it when the device was
disconnected (IP state NONE) and this could lead to a situation where
an incomplete config was applied; then we intersected the desired
configuration with the external - incomplete - one, causing the
removal of part of desired configuration (for example the default
route).

Fixes: d0b16b92 ('device: unconditionally reapply IP configuration on link up')

https://bugzilla.redhat.com/show_bug.cgi?id=1754511
!291
parent 7751c2fb
Pipeline #66941 canceled with stages
......@@ -3934,12 +3934,18 @@ device_link_changed (NMDevice *self)
if (priv->up && (!was_up || seen_down)) {
/* the link was down and just came up. That happens for example, while changing MTU.
* We must restore IP configuration. */
if (!ip_config_merge_and_apply (self, AF_INET, TRUE))
_LOGW (LOGD_IP4, "failed applying IP4 config after link comes up again");
if (NM_IN_SET (priv->ip_state_4, NM_DEVICE_IP_STATE_CONF,
NM_DEVICE_IP_STATE_DONE)) {
if (!ip_config_merge_and_apply (self, AF_INET, TRUE))
_LOGW (LOGD_IP4, "failed applying IP4 config after link comes up again");
}
priv->linklocal6_dad_counter = 0;
if (!ip_config_merge_and_apply (self, AF_INET6, TRUE))
_LOGW (LOGD_IP6, "failed applying IP6 config after link comes up again");
if (NM_IN_SET (priv->ip_state_6, NM_DEVICE_IP_STATE_CONF,
NM_DEVICE_IP_STATE_DONE)) {
if (!ip_config_merge_and_apply (self, AF_INET6, TRUE))
_LOGW (LOGD_IP6, "failed applying IP6 config after link comes up again");
}
}
if (update_unmanaged_specs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment