diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-05-08 08:44:51 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-05-08 15:43:30 +0200 |
| commit | ddfeed4530bb0ade4249025930da4f0456026d9f (patch) | |
| tree | dffa4519270121285af74adbc77a28216efa598a | |
| parent | 708ee92c29c457e802a47de0fe852cd5d4802fce (diff) | |
| download | NetworkManager-ddfeed4530bb0ade4249025930da4f0456026d9f.tar.gz | |
dhcp: set @was_active flag for external activations
Set the @was_active flag for external activations with DHCP, so that
DHCP is retried multiple times in case of failure, as we do for
managed connections when the lease expires and for assumed
connections.
Fixes test: renewal_gw_after_dhcp_outage_for_assumed_var1
Fixes: e3113fdc4b01d79080911b7450fc032dc0a85108
| -rw-r--r-- | src/devices/nm-device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 821d4a8339..1b6fc97f2d 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5844,7 +5844,7 @@ dhcp4_start (NMDevice *self, nm_device_add_pending_action (self, NM_PENDING_ACTION_DHCP4, TRUE); - if (nm_device_sys_iface_state_get (self) == NM_DEVICE_SYS_IFACE_STATE_ASSUME) + if (nm_device_sys_iface_state_is_external_or_assume (self)) priv->dhcp4.was_active = TRUE; /* DHCP devices will be notified by the DHCP manager when stuff happens */ @@ -6645,8 +6645,8 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection) self); } - if (nm_device_sys_iface_state_get (self) == NM_DEVICE_SYS_IFACE_STATE_ASSUME) - priv->dhcp6.was_active = TRUE; + if (nm_device_sys_iface_state_is_external_or_assume (self)) + priv->dhcp4.was_active = TRUE; return !!priv->dhcp6.client; } |