patch: fix 3.1 pointopoint regression

user have reported a bug with pointopoint in 3.1

https://forum.proxmox.com/threads/hetzner-pve-7-0-problems-after-reboot-maybe-ifupdown2.92935/

it's coming from a change in
https://github.com/CumulusNetworks/ifupdown2/commit/ba5437b9ecf9aa1401ac985ebf97009cc3114481

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/debian/patches/pve/0014-fix-pointopoint-regression.patch b/debian/patches/pve/0014-fix-pointopoint-regression.patch
new file mode 100644 (file)
index 0000000..68ee3a0
--- /dev/null
+++ b/debian/patches/pve/0014-fix-pointopoint-regression.patch
@@ -0,0 +1,28 @@
+From 416e7623eb92524c7100aebc7b7265056737813d Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier@odiso.com>
+Date: Mon, 26 Jul 2021 08:05:38 +0200
+Subject: [PATCH] fix pointopoint regression
+
+partially revert ba5437b9ecf9aa1401ac985ebf97009cc3114481
+
+https://forum.proxmox.com/threads/hetzner-pve-7-0-problems-after-reboot-maybe-ifupdown2.92935/
+Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
+---
+ ifupdown2/lib/nlcache.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ifupdown2/lib/nlcache.py b/ifupdown2/lib/nlcache.py
+index 9350ced..08f1108 100644
+--- a/ifupdown2/lib/nlcache.py
++++ b/ifupdown2/lib/nlcache.py
+@@ -3172,7 +3172,6 @@ class NetlinkListenerWithCache(nllistener.NetlinkManagerWithListener, BaseObject
+ 
+             if peer:
+                 log_msg.append("peer %s" % peer)
+-                peer = ipnetwork.IPAddress(peer)
+ 
+                 packet.add_attribute(Address.IFA_ADDRESS, peer)
+                 packet_prefixlen = peer.prefixlen
+-- 
+2.30.2
+

diff --git a/debian/patches/series b/debian/patches/series
index c8bcffbf8c542a963fcf86838498b15d5a644c48..a0053876cdf0d858e3e30c6421e22f11962304a0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ pve/0010-postinst-rm-update-network-config-compatibility.patch
 pve/0011-d-rules-drop-now-default-with-systemd.patch
 pve/0012-d-rules-add-dh_installsystemd-override-for-compat-12.patch
 pve/0013-postinst-reload-network-config-on-first-install.patch
+pve/0014-fix-pointopoint-regression.patch
\ No newline at end of file