[pve-devel] [PATCH ifupdown2 1/3] update patches
Alexandre Derumier
aderumier at odiso.com
Tue Jan 7 02:41:06 CET 2020
remove add-uplink-id-option.patch (not needed),
remove arp-accept option patch (available upstream)
remove debian-fixup-networking.service.patch (new @ifup service upstream)
rebase others patches
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
...-veth-fwpr-interfaces-from-bridge-on.patch | 44 +++++++++----
...add-dummy-mtu-bridgevlanport-modules.patch | 11 ++--
...0003-debian-fixup-networking.service.patch | 64 -------------------
...-subinterface-in-a-vlan-aware-bridge.patch | 46 -------------
...bridge-is-tap-veth-are-still-plugged.patch | 32 ----------
.../pve/0006-add-uplink-id-option.patch | 27 --------
...-vxlan-interfaces-when-ifreload_down.patch | 31 ---------
debian/patches/pve/0008-config-tuning.patch | 29 ---------
.../pve/0009-add-arp-accept-option.patch | 55 ----------------
debian/patches/series | 11 ++--
10 files changed, 41 insertions(+), 309 deletions(-)
delete mode 100644 debian/patches/pve/0003-debian-fixup-networking.service.patch
delete mode 100644 debian/patches/pve/0004-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch
delete mode 100644 debian/patches/pve/0005-don-t-remove-bridge-is-tap-veth-are-still-plugged.patch
delete mode 100644 debian/patches/pve/0006-add-uplink-id-option.patch
delete mode 100644 debian/patches/pve/0007-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
delete mode 100644 debian/patches/pve/0008-config-tuning.patch
delete mode 100644 debian/patches/pve/0009-add-arp-accept-option.patch
diff --git a/debian/patches/pve/0001-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch b/debian/patches/pve/0001-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch
index 8e0e7bf..869f0f3 100644
--- a/debian/patches/pve/0001-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch
+++ b/debian/patches/pve/0001-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch
@@ -1,30 +1,43 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 874ba884a7ff8f0059e069aac2855c2ffd5cacd2 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier at odiso.com>
Date: Wed, 16 May 2018 02:11:45 +0200
-Subject: [PATCH] don't remove (tap|veth|fwpr) interfaces from bridge on ifup
- bridge
+Subject: [PATCH 1/7] don't remove (tap|veth|fwpr) interfaces from bridge on
+ ifup bridge
as proxmox don't defined them in /etc/network/interfaces
Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
+ debian/rules | 2 +-
ifupdown2/addons/bridge.py | 4 ++++
- 1 file changed, 4 insertions(+)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+diff --git a/debian/rules b/debian/rules
+index 6274b3a..dfd460f 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -1,6 +1,6 @@
+ #!/usr/bin/make -f
+
+-#export DH_VERBOSE=1
++export DH_VERBOSE=1
+ export PYBUILD_NAME=ifupdown2
+ export PYBUILD_INSTALL_ARGS=--install-lib=/usr/share/ --install-scripts=/usr/share/
+
diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
-index 3e5fd78..bd597d7 100644
+index 00b1eaa..35944ac 100644
--- a/ifupdown2/addons/bridge.py
+++ b/ifupdown2/addons/bridge.py
-@@ -79,6 +79,7 @@ class bridge(moduleBase):
- 'bridge-ports-condone-regex' :
- {'help' : 'bridge ports to ignore/condone when reloading config / removing interfaces',
- 'required' : False,
-+ 'default' : '^(tap|veth|fwpr)',
- 'example' : [ 'bridge-ports-condone-regex ^[a-zA-Z0-9]+_v[0-9]{1,4}$']},
- 'bridge-stp' :
- {'help': 'bridge-stp yes/no',
-@@ -912,6 +913,9 @@ class bridge(moduleBase):
+@@ -440,6 +440,7 @@ class bridge(Addon, moduleBase):
+ "bridge-ports-condone-regex": {
+ "help": "bridge ports to ignore/condone when reloading config / removing interfaces",
+ "required": False,
++ "default": "^(tap|veth|fwpr)",
+ "example": ["bridge-ports-condone-regex ^[a-zA-Z0-9]+_v[0-9]{1,4}$"]
+ },
+ }
+@@ -1006,6 +1007,9 @@ class bridge(Addon, moduleBase):
# up a compiled regex to be used in a match later. This way we try to avoid
# a race condition where an (possibly VM) interface is created after this
# function has been called but before the bridgeports are validated.
@@ -34,3 +47,6 @@ index 3e5fd78..bd597d7 100644
if bridge_port_condone_regex:
if get_string:
return bridge_port_condone_regex
+--
+2.20.1
+
diff --git a/debian/patches/pve/0002-add-dummy-mtu-bridgevlanport-modules.patch b/debian/patches/pve/0002-add-dummy-mtu-bridgevlanport-modules.patch
index 2ba6810..c9e22d5 100644
--- a/debian/patches/pve/0002-add-dummy-mtu-bridgevlanport-modules.patch
+++ b/debian/patches/pve/0002-add-dummy-mtu-bridgevlanport-modules.patch
@@ -1,7 +1,7 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From a8368f92c36cd810933c3c5319c148976cc65a82 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier at odiso.com>
Date: Fri, 15 Jun 2018 00:36:03 +0200
-Subject: [PATCH] add dummy mtu, bridgevlanport modules
+Subject: [PATCH 2/7] add dummy mtu, bridgevlanport modules
As pve-manager package still provide ifupdown custom bridgevlanport && mtu script,
we can override them with ifupdown2 addon scripts, doing nothing.
@@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
create mode 100644 ifupdown2/addons/mtu.py
diff --git a/etc/network/ifupdown2/addons.conf b/etc/network/ifupdown2/addons.conf
-index dd3d223..73ef72d 100644
+index c43d377..e3639a7 100644
--- a/etc/network/ifupdown2/addons.conf
+++ b/etc/network/ifupdown2/addons.conf
-@@ -17,6 +17,8 @@ up,dhcp
+@@ -19,6 +19,8 @@ up,dhcp
up,address
up,addressvirtual
up,usercmds
@@ -77,3 +77,6 @@ index 0000000..efdf569
+class mtu(moduleBase):
+
+ _modinfo = {'mhelp' : 'dummy package to override proxmox script'}
+--
+2.20.1
+
diff --git a/debian/patches/pve/0003-debian-fixup-networking.service.patch b/debian/patches/pve/0003-debian-fixup-networking.service.patch
deleted file mode 100644
index fd9c8ba..0000000
--- a/debian/patches/pve/0003-debian-fixup-networking.service.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller at proxmox.com>
-Date: Tue, 3 Jul 2018 11:00:57 +0200
-Subject: [PATCH] debian: fixup networking.service
-
-Add missing ordering:
- After=network-pre.target
- See systemd.special(7)'s description of this target
- After=systemd-sysctl.service
- ifupdown does the same - we want net.*.conf.default.*
- sysctl keys to apply to newly created interfaces
- After=systemd-modules-load.service
- ifupdown does the same, though this should be mostly
- optional as modules should be autoloaded anyway
- Before=network.target
- This is required to prevent services which require
- network to be started too early and listen on wrong
- addresses (iow. only on loopback or ipv4-only).
- Before=network-online.target
- See systemd.special(7)'s description. We are the
- provider of this target.
- Before=shutdown.target
- ifupdown does it this way, it also makes more sense
- given the Conflict entry, compared to the previous
- WantedBy entry in [Install]
-
-Changed install section:
- WantedBy=multi-user.target
- I wasn't sure about this. ifupdown does this.
- basic.target didn't seem useful since we actually want:
- WantedBy=network-online.target
- We provide this, so we should be installed into it.
- removed WantedBy=network.target
- We strictly want to be ordered before this and instead
- are required by multi-user.target already.
- removed WantedBy=shutdown.target
- I didn't see the point.
-
-Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
----
- debian/ifupdown2.networking.service | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/debian/ifupdown2.networking.service b/debian/ifupdown2.networking.service
-index 06e1545..b5c45f9 100644
---- a/debian/ifupdown2.networking.service
-+++ b/debian/ifupdown2.networking.service
-@@ -2,7 +2,8 @@
- Description=ifupdown2 networking initialization
- Documentation=man:interfaces(5) man:ifup(8) man:ifdown(8)
- DefaultDependencies=no
--Before=shutdown.target
-+After=local-fs.target network-pre.target systemd-sysctl.service systemd-modules-load.service
-+Before=network.target shutdown.target network-online.target
- Conflicts=shutdown.target
-
- [Service]
-@@ -15,4 +16,4 @@ ExecStop=/usr/share/ifupdown2/sbin/start-networking stop
- ExecReload=/usr/share/ifupdown2/sbin/start-networking reload
-
- [Install]
--WantedBy=basic.target network.target shutdown.target
-+WantedBy=multi-user.target network-online.target
diff --git a/debian/patches/pve/0004-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch b/debian/patches/pve/0004-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch
deleted file mode 100644
index 7b66c3c..0000000
--- a/debian/patches/pve/0004-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier at odiso.com>
-Date: Mon, 1 Apr 2019 09:17:11 +0200
-Subject: [PATCH] allow vlan subinterface in a vlan-aware bridge
-
-for stacked/qinq vlan, it's perfectly fine to have a vlan-aware bridge with a tagged interface port
-
-fix:
-https://github.com/CumulusNetworks/ifupdown2/issues/92
-
-sample config:
-
-auto eth0.2
-iface eth0.2 inet manual
-
-auto bridge
-iface bridge inet manual
- bridge-ports eth0.2
- bridge-stp off
- bridge-fd 0
- bridge-vlan-aware yes
-
-bridge 8000.c81f66f8688c no eth0.2
-
-Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
----
- ifupdown2/addons/bridge.py | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
-index bd597d7..16862b7 100644
---- a/ifupdown2/addons/bridge.py
-+++ b/ifupdown2/addons/bridge.py
-@@ -790,11 +790,6 @@ class bridge(moduleBase):
- result = True
- for port_name in ports:
- port_obj_l = ifaceobj_getfunc(port_name)
-- if port_obj_l and port_obj_l[0].link_kind & ifaceLinkKind.VLAN:
-- self.logger.error('%s: %s: vlan sub-interface is not '
-- 'supported in a vlan-aware bridge'
-- % (ifaceobj.name, port_name))
-- result = False
- if (port_obj_l and
- port_obj_l[0].get_attr_value('bridge-arp-nd-suppress') and
- self.arp_nd_suppress_only_on_vxlan and
diff --git a/debian/patches/pve/0005-don-t-remove-bridge-is-tap-veth-are-still-plugged.patch b/debian/patches/pve/0005-don-t-remove-bridge-is-tap-veth-are-still-plugged.patch
deleted file mode 100644
index 5c66cf6..0000000
--- a/debian/patches/pve/0005-don-t-remove-bridge-is-tap-veth-are-still-plugged.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier at odiso.com>
-Date: Thu, 13 Jun 2019 14:34:59 +0200
-Subject: [PATCH] don't remove bridge is tap|veth are still plugged
-
-Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
----
- ifupdown2/ifupdown/ifupdownmain.py | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/ifupdown2/ifupdown/ifupdownmain.py b/ifupdown2/ifupdown/ifupdownmain.py
-index f520994..9f7641a 100644
---- a/ifupdown2/ifupdown/ifupdownmain.py
-+++ b/ifupdown2/ifupdown/ifupdownmain.py
-@@ -2067,7 +2067,15 @@ class ifupdownMain(ifupdownBase):
- # append it to the down list
- newifaceobjlist = new_ifaceobjdict.get(ifname)
- if not newifaceobjlist:
-- ifacedownlist.append(ifname)
-+ removebridge = 0
-+ if (ifaceLinkKind.to_str(lastifaceobjlist[0].link_kind) == 'bridge'):
-+ runningbridgeports = os.listdir('/sys/class/net/%s/brif/' % ifname)
-+ for bport in runningbridgeports:
-+ if re.match('^(tap|veth|fwpr)',bport):
-+ self.logger.warn("cant remove bridge %s, port %s is present " %(ifname,bport))
-+ removebridge = 1
-+ if removebridge != 1:
-+ ifacedownlist.append(ifname)
- continue
- # If ifaceobj was present in the old interfaces file,
- # and does not have a config in the new interfaces file
diff --git a/debian/patches/pve/0006-add-uplink-id-option.patch b/debian/patches/pve/0006-add-uplink-id-option.patch
deleted file mode 100644
index 07bb49d..0000000
--- a/debian/patches/pve/0006-add-uplink-id-option.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier at odiso.com>
-Date: Thu, 13 Jun 2019 14:40:17 +0200
-Subject: [PATCH] add uplink-id option
-
-Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
----
- ifupdown2/addons/address.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py
-index f576dc0..ce56ae6 100644
---- a/ifupdown2/addons/address.py
-+++ b/ifupdown2/addons/address.py
-@@ -111,6 +111,11 @@ class address(moduleBase):
- 'validvals': ['yes', 'no'],
- 'default' : 'no',
- 'example' : ['mpls-enable yes']},
-+ 'uplink-id' :
-+ { 'help': 'uplink-id',
-+ 'validrange' : ['1', '4096'],
-+ 'example' : ['uplink-id 1']},
-+
- 'ipv6-addrgen': {
- 'help': 'enable disable ipv6 link addrgenmode',
- 'validvals': ['on', 'off'],
diff --git a/debian/patches/pve/0007-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch b/debian/patches/pve/0007-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
deleted file mode 100644
index a45c218..0000000
--- a/debian/patches/pve/0007-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier at odiso.com>
-Date: Wed, 5 Jun 2019 14:47:05 +0200
-Subject: [PATCH] ifreload: down/up vxlan interfaces when
- ifreload_down_changed=0
-
-almost all attributes of vxlan interfaces can't be updated
-in current kernel (<= 5.2). (including vxlan-id)
-
-so when ifreload_down_changed=0, ifreload can't update vxlan.
-
-fix: https://github.com/CumulusNetworks/ifupdown2/issues/50
-Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
----
- ifupdown2/ifupdown/ifupdownmain.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ifupdown2/ifupdown/ifupdownmain.py b/ifupdown2/ifupdown/ifupdownmain.py
-index 9f7641a..8bb9f47 100644
---- a/ifupdown2/ifupdown/ifupdownmain.py
-+++ b/ifupdown2/ifupdown/ifupdownmain.py
-@@ -2107,7 +2107,7 @@ class ifupdownMain(ifupdownBase):
- % (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':
- continue
- if len(newifaceobjlist) != len(lastifaceobjlist):
- ifacedownlist.append(ifname)
diff --git a/debian/patches/pve/0008-config-tuning.patch b/debian/patches/pve/0008-config-tuning.patch
deleted file mode 100644
index 9967a94..0000000
--- a/debian/patches/pve/0008-config-tuning.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0863f43ed0621cf9cff0955c738d5e795daf76f5 Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier at odiso.com>
-Date: Mon, 31 Dec 2018 10:49:48 +0100
-Subject: [PATCH] config tuning
-
-multiple_vlan_aware_bridge_support=1
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
-Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
----
- etc/network/ifupdown2/ifupdown2.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/etc/network/ifupdown2/ifupdown2.conf b/etc/network/ifupdown2/ifupdown2.conf
-index e05c35f..47898b2 100644
---- a/etc/network/ifupdown2/ifupdown2.conf
-+++ b/etc/network/ifupdown2/ifupdown2.conf
-@@ -42,7 +42,7 @@ addon_python_modules_support=1
- # By default ifupdown2 only supports a single vlan filtering bridge
- # on the system. Set this flag to 1 to support multiple vlan
- # filtering bridges
--multiple_vlan_aware_bridge_support=0
-+multiple_vlan_aware_bridge_support=1
-
- # ifquery check status strings.
- # By default `ifquery --check` prints the check and
---
-2.20.1
-
diff --git a/debian/patches/pve/0009-add-arp-accept-option.patch b/debian/patches/pve/0009-add-arp-accept-option.patch
deleted file mode 100644
index dd27ffb..0000000
--- a/debian/patches/pve/0009-add-arp-accept-option.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 45db39f606e09486889128b93f1942639620d2aa Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier at odiso.com>
-Date: Tue, 3 Sep 2019 09:43:38 +0200
-Subject: [PATCH] add arp-accept option.
-
-Currently, the only way to enable arp-accept is to enable
-a policy with l3_intf_arp_accept.
-
-But this enable arp-accept for all bridges.
-
-This option allow to define it for specific bridge.
-
-This is needed with bgp-evpn and vm migration
-https://github.com/FRRouting/frr/issues/4904
----
- ifupdown2/addons/address.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py
-index f576dc0..762c58c 100644
---- a/ifupdown2/addons/address.py
-+++ b/ifupdown2/addons/address.py
-@@ -96,6 +96,11 @@ class address(moduleBase):
- 'dual connected VxLANs',
- 'validvals' : ['<ipv4>', ],
- 'example' : ['clagd-vxlan-anycast-ip 36.0.0.11']},
-+ 'arp-accept' :
-+ { 'help': 'Allow gratuitous arp to update arp table',
-+ 'validvals': ['on', 'off', 'yes', 'no', '0', '1'],
-+ 'default' : 'off',
-+ 'example' : ['arp-accept on']},
- 'ip-forward' :
- { 'help': 'ip forwarding flag',
- 'validvals': ['on', 'off', 'yes', 'no', '0', '1'],
-@@ -272,6 +277,8 @@ class address(moduleBase):
- def _process_bridge(self, ifaceobj, up):
- hwaddress = self._get_hwaddress(ifaceobj)
- addrs = ifaceobj.get_attr_value_first('address')
-+ arp_accept = ifaceobj.get_attr_value_first('arp-accept')
-+ arp_accept = utils.boolean_support_binary(arp_accept)
- is_vlan_dev_on_vlan_aware_bridge = False
- is_bridge = self.ipcmd.is_bridge(ifaceobj.name)
- if not is_bridge:
-@@ -290,7 +297,7 @@ class address(moduleBase):
- self.write_file('/proc/sys/net/ipv4/conf/%s' % ifaceobj.name +
- '/arp_accept', '0')
- else:
-- self.write_file('/proc/sys/net/ipv4/conf/%s/arp_accept' % ifaceobj.name, '0')
-+ self.write_file('/proc/sys/net/ipv4/conf/%s/arp_accept' % ifaceobj.name, arp_accept)
- if hwaddress and is_vlan_dev_on_vlan_aware_bridge:
- if up:
- self.ipcmd.bridge_fdb_add(bridgename, hwaddress, vlan)
---
-2.20.1
-
diff --git a/debian/patches/series b/debian/patches/series
index a66998f..145484c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,6 @@
pve/0001-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch
pve/0002-add-dummy-mtu-bridgevlanport-modules.patch
-pve/0003-debian-fixup-networking.service.patch
-pve/0004-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch
-pve/0005-don-t-remove-bridge-is-tap-veth-are-still-plugged.patch
-pve/0006-add-uplink-id-option.patch
-pve/0007-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
-pve/0008-config-tuning.patch
-pve/0009-add-arp-accept-option.patch
+pve/0003-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch
+pve/0004-don-t-remove-bridge-is-tap-veth-are-still-plugged.patch
+pve/0005-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
+pve/0006-config-tuning.patch
--
2.20.1
More information about the pve-devel
mailing list