[patch NetworkManager 08/11] nm-manager: do not fail if team device already exists



Similar has been done with bond and bridge

Signed-off-by: Jiri Pirko <jiri resnulli us>
---
 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 35f17ff..efcde4a 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -1334,7 +1334,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;
-- 
1.8.3.1



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]