From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ifupdown2 1/6] patch: patch5: fix code nit
Date: Tue, 16 May 2023 00:47:05 +0200 [thread overview]
Message-ID: <20230515224710.1331004-2-aderumier@odiso.com> (raw)
In-Reply-To: <20230515224710.1331004-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
...-up-vxlan-interfaces-when-ifreload_down.patch | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/debian/patches/pve/0005-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch b/debian/patches/pve/0005-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
index 63494c9..a0c6788 100644
--- a/debian/patches/pve/0005-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
+++ b/debian/patches/pve/0005-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
@@ -1,4 +1,4 @@
-From 2c38d0a157c8946f35a7da1c7c05484d33e6986f Mon Sep 17 00:00:00 2001
+From 1926699b02882bc5ed659d4debce2a0127d2edf0 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Wed, 5 Jun 2019 14:47:05 +0200
Subject: [PATCH 6/7] ifreload: down/up vxlan && vlan interfaces when
@@ -16,22 +16,24 @@ fix: https://github.com/CumulusNetworks/ifupdown2/issues/50
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- ifupdown2/ifupdown/ifupdownmain.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ ifupdown2/ifupdown/ifupdownmain.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ifupdown2/ifupdown/ifupdownmain.py b/ifupdown2/ifupdown/ifupdownmain.py
-index b4e1864..9313573 100644
+index b73c742..65fd67e 100644
--- a/ifupdown2/ifupdown/ifupdownmain.py
+++ b/ifupdown2/ifupdown/ifupdownmain.py
-@@ -2274,7 +2274,7 @@ class ifupdownMain:
+@@ -2355,7 +2355,9 @@ class ifupdownMain:
% (newifaceobjlist[objidx].name,
ifaceLinkKind.to_str(lastifaceobjlist[0].link_kind)))
ifacedownlist.append(newifaceobjlist[objidx].name)
- if not down_changed:
-+ if not down_changed and ifaceLinkKind.to_str(lastifaceobjlist[0].link_kind) != 'vxlan' and ifaceLinkKind.to_str(lastifaceobjlist[0].link_kind) != 'vlan':
++
++ ifacelink_kind = ifaceLinkKind.to_str(lastifaceobjlist[0].link_kind)
++ if not down_changed and ifacelink_kind != 'vxlan' and ifacelink_kind != 'vlan':
continue
if len(newifaceobjlist) != len(lastifaceobjlist):
ifacedownlist.append(ifname)
--
-2.20.1
+2.30.2
--
2.30.2
next prev parent reply other threads:[~2023-05-15 22:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 22:47 [pve-devel] [PATCH ifupdown2 0/6] bump to 3.2.0 Alexandre Derumier
2023-05-15 22:47 ` Alexandre Derumier [this message]
2023-05-15 22:47 ` [pve-devel] [PATCH ifupdown2 2/6] patch: remove old upstreamed patches Alexandre Derumier
2023-05-15 22:47 ` [pve-devel] [PATCH ifupdown2 3/6] patch: reorder patches Alexandre Derumier
2023-05-15 22:47 ` [pve-devel] [PATCH ifupdown2 4/6] patch: add ipv6 slaac support upstream patch Alexandre Derumier
2023-05-15 22:47 ` [pve-devel] [PATCH ifupdown2 5/6] patch: remove lacp bond min-links=0 warning Alexandre Derumier
2023-05-15 22:47 ` [pve-devel] [PATCH ifupdown2 6/6] bump version to 3.2.0-1+pmx1 Alexandre Derumier
2023-05-20 14:22 ` [pve-devel] applied: [PATCH ifupdown2 0/6] bump to 3.2.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=20230515224710.1331004-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.