[pve-devel] applied: [PATCH ifupdown2] allow address on vlan aware bridge

[Wolfgang Bumiller]

applied

On Sat, Jun 16, 2018 at 03:07:23PM +0200, Alexandre Derumier wrote:
> ---
>  .../0005-allow-address-on-vlan-aware-bridge.patch  | 33 ++++++++++++++++++++++
>  debian/patches/series                              |  1 +
>  2 files changed, 34 insertions(+)
>  create mode 100644 debian/patches/pve/0005-allow-address-on-vlan-aware-bridge.patch
> 
> diff --git a/debian/patches/pve/0005-allow-address-on-vlan-aware-bridge.patch b/debian/patches/pve/0005-allow-address-on-vlan-aware-bridge.patch
> new file mode 100644
> index 0000000..5f44911
> --- /dev/null
> +++ b/debian/patches/pve/0005-allow-address-on-vlan-aware-bridge.patch
> @@ -0,0 +1,33 @@
> +From e74d34a4e5c85f98683c61558c8fae8453d2b412 Mon Sep 17 00:00:00 2001
> +From: Alexandre Derumier <aderumier at odiso.com>
> +Date: Sat, 16 Jun 2018 14:59:46 +0200
> +Subject: [PATCH] allow address on vlan aware bridge
> +
> +This will allow to setup ip address on vlan aware bridge.
> +Note that in this case, the ip will use the default PVID.
> +---
> + ifupdown2/ifupdown/utils.py | 8 --------
> + 1 file changed, 8 deletions(-)
> +
> +diff --git a/ifupdown2/ifupdown/utils.py b/ifupdown2/ifupdown/utils.py
> +index f7a89a7..cee3425 100644
> +--- a/ifupdown2/ifupdown/utils.py
> ++++ b/ifupdown2/ifupdown/utils.py
> +@@ -346,14 +346,6 @@ class utils():
> +             else:
> +                 cls.logger.info(msg)
> +             return False
> +-        elif (ifaceobj.link_kind & ifaceLinkKind.BRIDGE
> +-                and ifaceobj.link_privflags & ifaceLinkPrivFlags.BRIDGE_VLAN_AWARE):
> +-            msg = '%s bridge vlan aware interfaces'
> +-            if syntax_check:
> +-                cls.logger.warning(msg)
> +-            else:
> +-                cls.logger.info(msg)
> +-            return False
> +         return True
> + 
> +     @classmethod
> +-- 
> +2.11.0
> +
> diff --git a/debian/patches/series b/debian/patches/series
> index 844d2f5..510229f 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -4,3 +4,4 @@ pve/0001-config-tuning.patch
>  pve/0002-manual-interfaces-set-link-up.patch
>  pve/0003-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch
>  pve/0004-add-dummy-mtu-bridgevlanport-modules.patch
> +pve/0005-allow-address-on-vlan-aware-bridge.patch
> -- 
> 2.11.0