From 2711e9be108063d9e269412c9026c10c63f1cda3 Mon Sep 17 00:00:00 2001

From: Beniamino Galvani <bgalvani@redhat.com>

Date: Sun, 19 May 2019 11:35:02 +0200

Subject: [PATCH] team: don't kill teamd for external devices

The teamd instance must not be killed if the device was externally

activated.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/158

https://bugzilla.redhat.com/show_bug.cgi?id=1693142

(cherry picked from commit 008a4b4215dcce40345b2c372ffc8cfd0d388fa5)

(cherry picked from commit bd113fe72eac3f609a6d05ab33ef52d6773c1985)

---

 src/devices/team/nm-device-team.c | 3 +++

 1 file changed, 3 insertions(+)

diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c

index 287f4d1b1..4ae276dbf 100644

--- a/src/devices/team/nm-device-team.c

+++ b/src/devices/team/nm-device-team.c

@@ -694,6 +694,9 @@ deactivate (NMDevice *device)

 	NMDeviceTeam *self = NM_DEVICE_TEAM (device);

 	NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (self);

+	if (nm_device_sys_iface_state_is_external (device))

+		return;

+

 	if (priv->teamd_pid || priv->tdc)

 		_LOGI (LOGD_TEAM, "deactivation: stopping teamd...");

-- 

2.20.1