fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 14:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "team: start teamd when ensuring team connection else teamdctl_connect() fails"

Browse source 
We don't want to start a teamd instance when there's an externally added team
interface. We just don't want to try to the daemon if it's not there (addressed
by a later commit).

This reverts commit a78386b6d1.

Conflicts:
	src/devices/team/nm-device-team.c

(cherry picked from commit 744e35e1d2)
This commit is contained in:
Lubomir Rintel 2014-12-16 15:05:35 +01:00
parent 01f358ec34
commit d842a9ece3
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/devices/team/nm-device-team.c
View file

@ -51,8 +51,6 @@ G_DEFINE_TYPE (NMDeviceTeam, nm_device_team, NM_TYPE_DEVICE)
#define NM_DEVICE_TEAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_TEAM, NMDeviceTeamPrivate))
static gboolean teamd_start (NMDevice *device, NMSettingTeam *s_team);
typedef struct {
struct teamdctl *tdc;
GPid teamd_pid;
@ -178,8 +176,7 @@ update_connection (NMDevice *device, NMConnection *connection)
}
g_object_set (G_OBJECT (s_team), NM_SETTING_TEAM_CONFIG, NULL, NULL);
teamd_start (device, s_team);
if (NM_DEVICE_TEAM_GET_PRIVATE (device)->teamd_pid > 0 && ensure_teamd_connection (device)) {
if (ensure_teamd_connection (device)) {
const char *config = NULL;
int err;
@ -426,8 +423,9 @@ teamd_start (NMDevice *device, NMSettingTeam *s_team)
priv->tdc ||
priv->teamd_timeout)
{
/* Just return if teamd_start() was already called */
return TRUE;
/* FIXME g_assert that this never hits. For now, be more reluctant, and try to recover. */
g_warn_if_reached ();
teamd_cleanup (device, FALSE);
}
teamd_binary = nm_utils_find_helper ("teamd", NULL, NULL);