diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2014-12-16 15:05:35 +0100 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-08 15:16:44 +0100 |
commit | 744e35e1d2ec569bf8131a397c7ea8ac7a881c1b (patch) | |
tree | ea85a460fe49e4d04883a5059852d51e18e6ef63 | |
parent | fc5a66b14b1a1c90996c3568e03390f9d86dcda4 (diff) | |
download | NetworkManager-744e35e1d2ec569bf8131a397c7ea8ac7a881c1b.tar.gz |
Revert "team: start teamd when ensuring team connection else teamdctl_connect() fails"
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 a78386b6d1a3d62063aa039d4ee9eba77c04a284.
Conflicts:
src/devices/team/nm-device-team.c
-rw-r--r-- | src/devices/team/nm-device-team.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index 16f1fcc2a5..2e5424ccc2 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -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); |