]> git.proxmox.com Git - ifupdown2.git/blob - debian/patches/pve/0007-openvswitch-ovs-ports-condone-regex-exclude-tap-veth.patch
patch: reorder patches
[ifupdown2.git] / debian / patches / pve / 0007-openvswitch-ovs-ports-condone-regex-exclude-tap-veth.patch
1 From 014e11b7f0eaeb901ada42eaf7a0cc257d85885c Mon Sep 17 00:00:00 2001
2 From: Alexandre Derumier <aderumier@odiso.com>
3 Date: Sun, 17 May 2020 15:46:36 +0200
4 Subject: [PATCH 07/12] openvswitch : ovs-ports-condone-regex : exclude
5 tap|veth|fwln
6
7 Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
8 ---
9 ifupdown2/addons/openvswitch.py | 3 +++
10 1 file changed, 3 insertions(+)
11
12 diff --git a/ifupdown2/addons/openvswitch.py b/ifupdown2/addons/openvswitch.py
13 index 0a124ba..40fc36a 100644
14 --- a/ifupdown2/addons/openvswitch.py
15 +++ b/ifupdown2/addons/openvswitch.py
16 @@ -71,6 +71,7 @@ class openvswitch(Addon, moduleBase):
17 },
18 'ovs-ports-condone-regex': {
19 "help": "ovs ports to ignore/condone when reloading config / removing interfaces",
20 + "default": "^(tap|veth|fwln)",
21 "required": False,
22 "example": ["ovs-ports-condone-regex ^[a-zA-Z0-9]+_v[0-9]{1,4}$"]
23 },
24 @@ -116,6 +117,8 @@ class openvswitch(Addon, moduleBase):
25
26 def _get_ovs_port_condone_regex(self, ifaceobj, get_string = False):
27 ovs_port_condone_regex = ifaceobj.get_attr_value_first('ovs-ports-condone-regex')
28 + if not ovs_port_condone_regex:
29 + ovs_port_condone_regex = self.get_attr_default_value('ovs-ports-condone-regex')
30 if ovs_port_condone_regex:
31 if get_string:
32 return ovs_port_condone_regex
33 --
34 2.30.2
35