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

ovs: fail device only when it's activating

Browse source 
It doesn't make sense to fail a device that is not activating.

Especially, if the device was in state UNMANAGED, it would enter state
FAILED (and then DISCONNECTED) or ACTIVATED (when external or
assumed); both are wrong.

https://bugzilla.redhat.com/show_bug.cgi?id=2077950
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1302
(cherry picked from commit 93372e8100)
(cherry picked from commit 562239779c)
This commit is contained in:
Beniamino Galvani 2022-07-18 10:00:49 +02:00
parent 36cbca83e7
commit b43503b67b
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/devices/ovs/nm-ovs-factory.c
View file

@ -244,7 +244,11 @@ ovsdb_interface_failed(NMOvsdb *ovsdb,
TRUE);
}
nm_device_state_changed(device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_OVSDB_FAILED);
if (nm_device_is_activating(device)) {
nm_device_state_changed(device,
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_OVSDB_FAILED);
}
}
static void