From 21ca2cf0f68c79516a885928c33268bb3f12b47e Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 2 May 2016 17:13:06 +0200 Subject: device: remove pending dhcp actions also in IP_DONE state 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 0b66eb298e1d6ac1ef516635e7055a6c819b4e09) --- src/devices/nm-device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 242af8dca1..8472ff800c 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4467,6 +4467,8 @@ dhcp4_lease_change (NMDevice *self, NMIP4Config *config) NULL, NULL, NULL); + + nm_device_remove_pending_action (self, PENDING_ACTION_DHCP4, FALSE); } } @@ -5198,6 +5200,8 @@ dhcp6_lease_change (NMDevice *self) settings_connection, nm_device_get_applied_connection (self), self, NULL, NULL, NULL); + + nm_device_remove_pending_action (self, PENDING_ACTION_DHCP6, FALSE); } } -- cgit v1.2.1