diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-05-19 11:35:02 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-05-20 14:54:07 +0200 |
| commit | 008a4b4215dcce40345b2c372ffc8cfd0d388fa5 (patch) | |
| tree | 8a459425fb69b967d16f933491a42e6884189cb4 | |
| parent | 95cc3843778350e3e8da2a849bd7ee6ec892d711 (diff) | |
| download | NetworkManager-008a4b4215dcce40345b2c372ffc8cfd0d388fa5.tar.gz | |
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
| -rw-r--r-- | src/devices/team/nm-device-team.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index 287f4d1b18..4ae276dbf0 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..."); |