summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2022-08-29 09:08:40 +0200
committerLubomir Rintel <lkundrak@v3.sk>2022-09-01 12:44:10 +0200
commitaf32e2da4c5bb3a14a3f42a3a2d687025323430f (patch)
treef8c5fa6419268e1b8b02320526ef55e1b3b5bad0
parente1a25592a201d1e9ee10e45349100cef7511f697 (diff)
device: don't emit recheck-assume if there is a queued activation requestlr/team-things
If there is a queued activation request waiting (e.g. for carrier), we shouldn't generate a new connection. Fixes-test: dracut_NM_vlan_over_team_no_boot
-rw-r--r--src/core/devices/nm-device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 41b4c9b92b..22aadc5a28 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -8960,7 +8960,7 @@ nm_device_emit_recheck_assume(gpointer user_data)
priv = NM_DEVICE_GET_PRIVATE(self);
priv->recheck_assume_id = 0;
- if (!nm_device_get_act_request(self))
+ if (!priv->queued_act_request && !nm_device_get_act_request(self))
g_signal_emit(self, signals[RECHECK_ASSUME], 0);
return G_SOURCE_REMOVE;