proxmox-mirrors/ifupdown2
1
0
Fork 0
mirror of https://git.proxmox.com/git/ifupdown2 synced 2025-04-28 17:09:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix patch 0008-lacp: replace else with if condition

Browse Source 
The original patch removed the first branch of `if` condition, leaving the
`else` in which matched the `if` above.
The correct condition for this `else` is any bond mode that is not `lacp`
(4).

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
This commit is contained in:
Mira Limbeck 2023-11-20 13:52:08 +01:00 committed by Thomas Lamprecht
parent 033e928212
commit 911804b5fc
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
debian/patches/pve/0008-lacp-bond-remove-bond-min-links-0-warning.patch vendored
View File

@ -1,4 +1,4 @@
From df1e76e6bcdca3044ee9d53ddb62a71bedf4b8a6 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com> From: Alexandre Derumier <aderumier@odiso.com>
Date: Tue, 16 May 2023 00:33:36 +0200 Date: Tue, 16 May 2023 00:33:36 +0200
Subject: [PATCH] lacp bond: remove bond-min-links=0 warning Subject: [PATCH] lacp bond: remove bond-min-links=0 warning
@ -6,15 +6,17 @@ Subject: [PATCH] lacp bond: remove bond-min-links=0 warning
This is only cumulus specific This is only cumulus specific
Signed-off-by: Alexandre Derumier <aderumier@odiso.com> Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
[ML: fixed condition of the remaining `else` branch]
Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
--- ---
ifupdown2/addons/bond.py | 7 ------- ifupdown2/addons/bond.py | 9 +--------
1 file changed, 7 deletions(-) 1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/ifupdown2/addons/bond.py b/ifupdown2/addons/bond.py diff --git a/ifupdown2/addons/bond.py b/ifupdown2/addons/bond.py
index 74d2cab..4a555cc 100644 index 74d2cab..e18fcbc 100644
--- a/ifupdown2/addons/bond.py --- a/ifupdown2/addons/bond.py
+++ b/ifupdown2/addons/bond.py +++ b/ifupdown2/addons/bond.py
@@ -610,13 +610,6 @@ class bond(Addon, moduleBase): @@ -610,14 +610,7 @@ class bond(Addon, moduleBase):
# if we need to reset the mode to system default # if we need to reset the mode to system default
ifla_info_data[Link.IFLA_BOND_MODE] = ifla_bond_mode ifla_info_data[Link.IFLA_BOND_MODE] = ifla_bond_mode
@ -25,9 +27,8 @@ index 74d2cab..4a555cc 100644
- # get_min_links_nl may return None so we need to strictly check 0 - # get_min_links_nl may return None so we need to strictly check 0
- if min_links == 0: - if min_links == 0:
- self.logger.warning('%s: attribute bond-min-links is set to \'0\'' % ifname) - self.logger.warning('%s: attribute bond-min-links is set to \'0\'' % ifname)
else: - else:
+ if ifla_bond_mode != 4:
# IFLA_BOND_AD_LACP_RATE and IFLA_BOND_AD_LACP_BYPASS only for 802.3ad mode (4) # IFLA_BOND_AD_LACP_RATE and IFLA_BOND_AD_LACP_BYPASS only for 802.3ad mode (4)
for nl_attr, attr_name in self._bond_lacp_attrs: for nl_attr, attr_name in self._bond_lacp_attrs:
-- if nl_attr in ifla_info_data:
2.30.2