1.31-12

Resolves: rhbz#2060445

Signed-off-by: Hangbin Liu <haliu@redhat.com>

0006-utils-team2bond-do-not-add-miimon-if-already-exist.patch

@@ -0,0 +1,27 @@
+From 5616af4387302e9e6ec07dd5466f4a0e93c50a59 Mon Sep 17 00:00:00 2001
+From: Hangbin Liu <haliu@redhat.com>
+Date: Mon, 7 Mar 2022 14:39:25 +0800
+Subject: [PATCH 6/6] utils/team2bond: do not add miimon if already exist
+
+Signed-off-by: Hangbin Liu <haliu@redhat.com>
+---
+ utils/team2bond | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/utils/team2bond b/utils/team2bond
+index 118f38b..b5555c1 100755
+--- a/utils/team2bond
++++ b/utils/team2bond
+@@ -117,7 +117,8 @@ def convert_link_watch(link_watch_opts, arp_target, exist_opts):
+         sys.exit(1)
+ 
+     if link_watch_opts['name'] == 'ethtool':
+-        bond_opts += ",miimon=100"
++        if exist_opts.find("miimon") == -1:
++            bond_opts += ",miimon=100"
+         if 'delay_up' in link_watch_opts:
+             bond_opts += ",updelay=" + str(link_watch_opts['delay_up'])
+         if 'delay_down' in link_watch_opts:
+-- 
+2.31.1
+

libteam.spec

@@ -1,6 +1,6 @@
 Name: libteam
 Version: 1.31
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Library for controlling team network device
 License: LGPLv2+
 URL: http://www.libteam.org
@@ -11,6 +11,7 @@ Patch2: 0002-team2bond-fix-min_ports-format-and-add-lacp_key.patch
 Patch3: 0003-utils-team2bond-add-cautions-for-the-script.patch
 Patch4: 0004-man-add-team2bond-man-doc.patch
 Patch5: 0005-Revert-teamd-Disregard-current-state-when-considerin.patch
+Patch6: 0006-utils-team2bond-do-not-add-miimon-if-already-exist.patch
 
 BuildRequires: gcc
 BuildRequires: jansson-devel
@@ -143,6 +144,9 @@ install -p -m 755 utils/team2bond $RPM_BUILD_ROOT%{_bindir}/team2bond
 %{_sysconfdir}/sysconfig/network-scripts/ifdown-TeamPort
 
 %changelog
+* Mon Mar 7 2020 Hangbin Liu <haliu@redhat.com> - 1.31-12
+- utils/team2bond: do not add miimon if already exist (rhbz#2060445)
+
 * Mon Nov 15 2021 Xin Long <lxin@redhat.com> - 1.31-11
 - Revert "teamd: Disregard current state when considering port enablement" [1894546]