[pve-devel] [PATCH pve-network 2/2] patches: allow ip|ip6-forward option on bridge

[Alexandre Derumier <aderumier@odiso.com>]

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
 debian/patches/series                         |  1 +
 ...dress-allow-ip-ip6-forward-on-bridge.patch | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 debian/patches/upstream/0001-address-allow-ip-ip6-forward-on-bridge.patch

diff --git a/debian/patches/series b/debian/patches/series
index 557aa7f..3b80321 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@ pve/0006-openvswitch-ovs-ports-condone-regex-exclude-tap-veth.patch
 pve/0007-allow-vlan-tag-inside-vxlan-tunnel.patch
 pve/0008-lacp-bond-remove-bond-min-links-0-warning.patch
 pve/0009-gvgeb-fix-python-interpreter-shebang.patch
+upstream/0001-address-allow-ip-ip6-forward-on-bridge.patch
 upstream/0001-add-ipv6-slaac-support-inet6-auto-accept_ra.patch
 upstream/0001-addons-ethtool-add-rx-vlan-filter.patch
 upstream/0001-scheduler-import-traceback.patch
diff --git a/debian/patches/upstream/0001-address-allow-ip-ip6-forward-on-bridge.patch b/debian/patches/upstream/0001-address-allow-ip-ip6-forward-on-bridge.patch
new file mode 100644
index 0000000..b61d891
--- /dev/null
+++ b/debian/patches/upstream/0001-address-allow-ip-ip6-forward-on-bridge.patch
@@ -0,0 +1,32 @@
+From cd21f46308052ae092d1036886cde2c3177e3642 Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier@gmail.com>
+Date: Thu, 22 Feb 2024 13:11:02 +0100
+Subject: [PATCH 2/2] address: allow ip|ip6-forward on bridge
+
+Currently, a bridge always have forward enabled if an ip exist,
+or disabled if not ip is present.
+
+we can't use ip-forward on|off to override it because of this return.
+
+Signed-off-by: Alexandre Derumier <aderumier@gmail.com>
+Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
+---
+ ifupdown2/addons/address.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py
+index bb5589e..7310646 100644
+--- a/ifupdown2/addons/address.py
++++ b/ifupdown2/addons/address.py
+@@ -984,7 +984,7 @@ class address(AddonWithIpBlackList, moduleBase):
+ 
+         if (ifaceobj.link_kind & ifaceLinkKind.BRIDGE):
+             self._set_bridge_forwarding(ifaceobj)
+-            return
++
+         if not self.syntax_check_sysctls(ifaceobj):
+             return
+         if not self.syntax_check_l3_svi_ip_forward(ifaceobj):
+-- 
+2.39.2
+
-- 
2.39.2