summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2023-01-31 11:31:35 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2023-02-13 15:51:11 +0100
commitc273962a73d6b0d9839154f4f9dc99e794f64bff (patch)
tree05637a362111f5f1d81e14f2e4c7991e724aec87
parent8f2afc8d4059a2b69549a72ad8cc7488d902cd37 (diff)
downloadNetworkManager-c273962a73d6b0d9839154f4f9dc99e794f64bff.tar.gz
device: preserve assume state if updating port fails
If we fail to update the port connection, don't forget the assume state but try again later. This helps when assuming a team connection and its ports: the ports may fail to generate a connection because teamd was not started yet; in that case we need to try again. https://bugzilla.redhat.com/show_bug.cgi?id=2092215 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1523 (cherry picked from commit 27ad228df14663c7041766d92f9ee8b11e24b4aa)
-rw-r--r--src/core/devices/nm-device.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 044786149c..e278a702f9 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -8581,6 +8581,7 @@ nm_device_generate_connection(NMDevice *self,
nm_device_get_iface(master),
local->message);
g_error_free(local);
+ NM_SET_OUT(out_maybe_later, TRUE);
return NULL;
}
} else {