From da5b9a569c8c7231c5e8daaff484cb0bf21908b0 Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Tue, 28 Jan 2020 11:55:52 +0100 Subject: [PATCH 1/2] addons.conf: remove duplicate entry for tunnel pre-up Signed-off-by: Julien Fortin --- etc/network/ifupdown2/addons.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/network/ifupdown2/addons.conf b/etc/network/ifupdown2/addons.conf index c43d377..7975a80 100644 --- a/etc/network/ifupdown2/addons.conf +++ b/etc/network/ifupdown2/addons.conf @@ -12,7 +12,6 @@ pre-up,bridgevlan pre-up,mstpctl pre-up,tunnel pre-up,vrf -pre-up,tunnel pre-up,ethtool pre-up,address up,dhcp From 040192991d52fb01cfabdf8bf8ba3d5e82fd7953 Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Tue, 28 Jan 2020 11:56:19 +0100 Subject: [PATCH 2/2] nlpacket: add tunnel link_kind to encode support list fixing: TypeError: cannot concatenate 'str' and 'NoneType' objects Signed-off-by: Julien Fortin --- ifupdown2/nlmanager/nlpacket.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ifupdown2/nlmanager/nlpacket.py b/ifupdown2/nlmanager/nlpacket.py index fcb89fb..cb125f4 100644 --- a/ifupdown2/nlmanager/nlpacket.py +++ b/ifupdown2/nlmanager/nlpacket.py @@ -2791,6 +2791,18 @@ class AttributeIFLA_LINKINFO(Attribute): "dummy", "bridge", "macvlan", + "gre", + "gretap", + "erspan", + "ip6gre", + "ip6gretap", + "ip6erspan", + "vti", + "vti6", + "ipip", + "sit", + "ip6tnl", + ): self.log.debug('Unsupported IFLA_INFO_KIND %s' % kind) return