fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 07:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: remove pending dhcp actions also in IP_DONE state

Browse source 
When the IP status is IP_DONE and a DHCP transaction succeeds the
'dhcp4' and 'dhcp6' pending actions must be removed. Without this, a
temporary link loss just after the activation would cause a DHCP
restart and those actions would remain set, blocking the startup.

https://bugzilla.redhat.com/show_bug.cgi?id=1330893
(cherry picked from commit 21ca2cf0f6)
This commit is contained in:
Beniamino Galvani 2016-05-02 17:13:06 +02:00
parent a5fc83ad4e
commit 46ef667de8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/devices/nm-device.c
View file

@ -3482,6 +3482,8 @@ dhcp4_lease_change (NMDevice *self, NMIP4Config *config)
NULL,
NULL,
NULL);
nm_device_remove_pending_action (self, PENDING_ACTION_DHCP4, FALSE);
}
}
@ -4167,6 +4169,8 @@ dhcp6_lease_change (NMDevice *self)
} else {
/* Notify dispatcher scripts of new DHCPv6 config */
nm_dispatcher_call (DISPATCHER_ACTION_DHCP6_CHANGE, connection, self, NULL, NULL, NULL);
nm_device_remove_pending_action (self, PENDING_ACTION_DHCP6, FALSE);
}
}