diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2020-02-07 21:55:32 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2020-02-10 17:52:54 +0100 |
| commit | a31fcd7ec7c8fe45a4d326c59711f0b0754c675b (patch) | |
| tree | f615cc8e36897dcbc62679a548d3e65790e1de70 | |
| parent | 1d0e576971028ca9c883d1fea35fa0b22a644c70 (diff) | |
| download | NetworkManager-bg/team-race-rh1798947.tar.gz | |
team: ignore bus name appearance when killing teamdbg/team-race-rh1798947
If we are currently killing teamd, we are not interested in knowing
when it becomes ready.
| -rw-r--r-- | src/devices/team/nm-device-team.c | 6 |
1 files changed, 6 insertions, 0 deletions
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. */ |