From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ifupdown2 1/2] update patches
Date: Wed, 14 Jul 2021 09:52:22 +0200 [thread overview]
Message-ID: <20210714075223.2866634-2-aderumier@odiso.com> (raw)
In-Reply-To: <20210714075223.2866634-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
.../pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch b/debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch
index 7d0cecd..7a42f41 100644
--- a/debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch
+++ b/debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch
@@ -1,4 +1,4 @@
-From a53022b71d98abf1cc34bf380309853fbb18b443 Mon Sep 17 00:00:00 2001
+From 14a29c0ef26946a4721103a943249d5c3e74a865 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Mon, 21 Sep 2020 08:47:25 +0200
Subject: [PATCH] allow vlan tag inside vxlan tunnel
@@ -11,10 +11,10 @@ Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
1 file changed, 5 deletions(-)
diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
-index 2b9ea84..b835ac2 100644
+index f9c789d..72c7a2f 100644
--- a/ifupdown2/addons/bridge.py
+++ b/ifupdown2/addons/bridge.py
-@@ -1557,11 +1557,6 @@ class bridge(Addon, moduleBase):
+@@ -1602,11 +1602,6 @@ class bridge(Bridge, moduleBase):
because kernel does honor vid info flags during deletes.
"""
@@ -24,8 +24,8 @@ index 2b9ea84..b835ac2 100644
- bportifaceobj.upperifaces[0])
- return
- vids_int = self._ranges_to_ints(vids)
+ vids_int = utils.ranges_to_ints(vids)
try:
--
-2.20.1
+2.30.2
--
2.30.2
next prev parent reply other threads:[~2021-07-14 7:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 7:52 [pve-devel] [PATCH ifupdown2 0/2] update to 3.1.0 Alexandre Derumier
2021-07-14 7:52 ` Alexandre Derumier [this message]
2021-07-14 7:52 ` [pve-devel] [PATCH ifupdown2 2/2] bump version to 3.1.0-1+pve1 Alexandre Derumier
2021-07-14 15:05 ` [pve-devel] applied: [PATCH ifupdown2 0/2] update to 3.1.0 Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210714075223.2866634-2-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox