diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2023-04-07 14:48:49 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2023-04-11 09:56:46 +0200 |
| commit | 5f9547dcc148f656d57973434b9cf96a3bc71b8f (patch) | |
| tree | fefb10118befea2a66f547fc5b1020ed8365f3b3 | |
| parent | 8ae744ee5d5974fed8679db95e88b81c5c60035e (diff) | |
| download | NetworkManager-5f9547dcc148f656d57973434b9cf96a3bc71b8f.tar.gz | |
device: stop activation when queueing the unmanaged state
When the unmanaged state is queued, we must ensure that the current
activation doesn't overwrite the queue stated with a new one. This can
happen for example if a dispatcher script or a firewall call
terminate, or if the next activation stage is dispatched.
Fixes-test: @preserve_master_and_ip_settings
https://bugzilla.redhat.com/show_bug.cgi?id=2178269
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1599
(cherry picked from commit 89a8f51235b7cc9c39c2aea8ff717da4e051f8e6)
(cherry picked from commit b2ed01efc981fd3c6a32aac1f29d4e622e2ae305)
| -rw-r--r-- | src/core/devices/nm-device.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 31acc1c1fe..d52d2eee8c 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -14474,6 +14474,9 @@ _set_unmanaged_flags(NMDevice *self, if (transition_state) { new_state = was_managed ? NM_DEVICE_STATE_UNMANAGED : NM_DEVICE_STATE_UNAVAILABLE; + if (new_state == NM_DEVICE_STATE_UNMANAGED) { + _cancel_activation(self); + } if (now) nm_device_state_changed(self, new_state, reason); else |