From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 192F69B3AC for ; Mon, 20 Nov 2023 13:52:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F0457197D6 for ; Mon, 20 Nov 2023 13:52:16 +0100 (CET) Received: from nena.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Mon, 20 Nov 2023 13:52:16 +0100 (CET) Received: by nena.proxmox.com (Postfix, from userid 1000) id 4F8132F7662; Mon, 20 Nov 2023 13:52:16 +0100 (CET) From: Mira Limbeck To: pve-devel@lists.proxmox.com Date: Mon, 20 Nov 2023 13:52:08 +0100 Message-Id: <20231120125208.496176-1-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.683 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH ifupdown2] fix patch 0008-lacp: replace else with if condition X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Nov 2023 12:52:47 -0000 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 --- ...bond-remove-bond-min-links-0-warning.patch | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/patches/pve/0008-lacp-bond-remove-bond-min-links-0-warning.patch b/debian/patches/pve/0008-lacp-bond-remove-bond-min-links-0-warning.patch index 089b315..07ed0b2 100644 --- a/debian/patches/pve/0008-lacp-bond-remove-bond-min-links-0-warning.patch +++ b/debian/patches/pve/0008-lacp-bond-remove-bond-min-links-0-warning.patch @@ -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 Date: Tue, 16 May 2023 00:33:36 +0200 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 Signed-off-by: Alexandre Derumier +[ML: fixed condition of the remaining `else` branch] +Signed-off-by: Mira Limbeck --- - ifupdown2/addons/bond.py | 7 ------- - 1 file changed, 7 deletions(-) + ifupdown2/addons/bond.py | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) 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 +++ 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 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 - if min_links == 0: - 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) for nl_attr, attr_name in self._bond_lacp_attrs: --- -2.30.2 - + if nl_attr in ifla_info_data: -- 2.39.2