From 51aa63dd5474fb87c950ca2c4541b1e792a2f459 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 30 Aug 2019 06:53:13 +0200 Subject: [PATCH] re-add config tuning patch lost during upgrade to 1.2.8 Reported-by: Mira Limbeck Signed-off-by: Thomas Lamprecht --- ...-veth-fwpr-interfaces-from-bridge-on.patch | 5 +-- ...-subinterface-in-a-vlan-aware-bridge.patch | 2 +- debian/patches/pve/0008-config-tuning.patch | 40 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 debian/patches/pve/0008-config-tuning.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 01a0a90..8e0e7bf 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,4 +1,4 @@ -From f01a763647fa21b6192a94f184dd7d9d772b4e9e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Wed, 16 May 2018 02:11:45 +0200 Subject: [PATCH] don't remove (tap|veth|fwpr) interfaces from bridge on ifup @@ -34,6 +34,3 @@ 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/0004-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch b/debian/patches/pve/0004-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch index e597f65..7b66c3c 100644 --- 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 @@ -29,7 +29,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 5 deletions(-) diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py -index f40e2e7..ebe2f7b 100644 +index bd597d7..16862b7 100644 --- a/ifupdown2/addons/bridge.py +++ b/ifupdown2/addons/bridge.py @@ -790,11 +790,6 @@ class bridge(moduleBase): diff --git a/debian/patches/pve/0008-config-tuning.patch b/debian/patches/pve/0008-config-tuning.patch new file mode 100644 index 0000000..5ea7781 --- /dev/null +++ b/debian/patches/pve/0008-config-tuning.patch @@ -0,0 +1,40 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Alexandre Derumier +Date: Mon, 31 Dec 2018 10:49:48 +0100 +Subject: [PATCH] config tuning + +allow ovs_... options: + addon_syntax_check=0 + +multiple_vlan_aware_bridge_support=1 + +don't shutdown tap, veth, vmbrvX, fwbr on reload +(as they are not defined in /etc/network/interfaces) + +Signed-off-by: Thomas Lamprecht +--- + etc/network/ifupdown2/ifupdown2.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/etc/network/ifupdown2/ifupdown2.conf b/etc/network/ifupdown2/ifupdown2.conf +index e05c35f..2d2c177 100644 +--- a/etc/network/ifupdown2/ifupdown2.conf ++++ b/etc/network/ifupdown2/ifupdown2.conf +@@ -29,7 +29,7 @@ disable_cli_interfacesfile=0 + # are used. But when a mix of scripts and modules are used (which is the + # default case), you may get false warnings for attributes supported + # by scripts +-addon_syntax_check=0 ++addon_syntax_check=1 + + # Support executing of ifupdown style scripts. + # Note that by default python addon modules override scripts with the same +@@ -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 diff --git a/debian/patches/series b/debian/patches/series index 0d7ac4b..feea3bc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 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 -- 2.39.2