From fb454b2c33ca29ce83a87e15f4e3cb6aa37486f6 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Fri, 16 Aug 2013 16:08:30 +0200 Subject: [PATCH] nm-manager: do not fail if team device already exists Similar has been done with bond and bridge Signed-off-by: Jiri Pirko --- src/nm-manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 238fced4f5..26d87d285e 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1371,7 +1371,8 @@ system_create_virtual_device (NMManager *self, NMConnection *connection) device = nm_device_bond_new (iface); } else if (nm_connection_is_type (connection, NM_SETTING_TEAM_SETTING_NAME)) { - if (!nm_platform_team_add (iface)) { + if (!nm_platform_team_add (iface) + && nm_platform_get_error () != NM_PLATFORM_ERROR_EXISTS) { nm_log_warn (LOGD_DEVICE, "(%s): failed to add team master interface for '%s'", iface, nm_connection_get_id (connection)); goto out;