diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-05-02 17:13:06 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-05-10 18:01:30 +0200 |
| commit | 21ca2cf0f68c79516a885928c33268bb3f12b47e (patch) | |
| tree | e1da34820e7055da00d6b9a3083ff88e703196c6 | |
| parent | b2f35d58f508bbc0df78bc297cf99e8536c756b4 (diff) | |
| download | NetworkManager-21ca2cf0f68c79516a885928c33268bb3f12b47e.tar.gz | |
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)
| -rw-r--r-- | src/devices/nm-device.c | 4 |
1 files changed, 4 insertions, 0 deletions
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); } } |