debian/patches/pve/0001-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch

   1 From 76e402e8b446861adf45f8ece54d616808586b71 Mon Sep 17 00:00:00 2001
   2 From: Alexandre Derumier <aderumier@odiso.com>
   3 Date: Wed, 16 May 2018 02:11:45 +0200
   4 Subject: [PATCH 01/12] don't remove (tap|veth|fwpr) interfaces from bridge on
   5  ifup bridge
   6
   7 as proxmox don't defined them in /etc/network/interfaces
   8
   9 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  10 Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
  11 ---
  12  ifupdown2/addons/bridge.py | 4 ++++
  13  1 file changed, 4 insertions(+)
  14
  15 diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
  16 index 954e462..ff98b18 100644
  17 --- a/ifupdown2/addons/bridge.py
  18 +++ b/ifupdown2/addons/bridge.py
  19 @@ -443,6 +443,7 @@ class bridge(Bridge, moduleBase):
  20              "bridge-ports-condone-regex": {
  21                      "help": "bridge ports to ignore/condone when reloading config / removing interfaces",
  22                      "required": False,
  23 +                    "default": "^(tap|veth|fwpr)",
  24                      "example": ["bridge-ports-condone-regex ^[a-zA-Z0-9]+_v[0-9]{1,4}$"]
  25              },
  26              "bridge-vlan-vni-map": {
  27 @@ -1152,6 +1153,9 @@ class bridge(Bridge, moduleBase):
  28          # up a compiled regex to be used in a match later. This way we try to avoid
  29          # a race condition where an (possibly VM) interface is created after this
  30          # function has been called but before the bridgeports are validated.
  31 +        if not bridge_port_condone_regex:
  32 +            bridge_port_condone_regex = self.get_attr_default_value('bridge-ports-condone-regex')
  33 +
  34          if bridge_port_condone_regex:
  35              if get_string:
  36                  return bridge_port_condone_regex
  37 --
  38 2.30.2
  39