From a31fcd7ec7c8fe45a4d326c59711f0b0754c675b Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 7 Feb 2020 21:55:32 +0100 Subject: team: ignore bus name appearance when killing teamd If we are currently killing teamd, we are not interested in knowing when it becomes ready. --- src/devices/team/nm-device-team.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index a76a877589..a0749c21f6 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -356,6 +356,12 @@ teamd_dbus_appeared (GDBusConnection *connection, _LOGI (LOGD_TEAM, "teamd appeared on D-Bus"); nm_device_queue_recheck_assume (device); + if (priv->kill_in_progress) { + /* If we are currently killing teamd, we are not + * interested in knowing when it becomes ready. */ + return; + } + /* If another teamd grabbed the bus name while our teamd was starting, * just ignore the death of our teamd and run with the existing one. */ -- cgit v1.2.1