backport fix to avoid exception in ifreload

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/debian/patches/extra/0001-argv-move-nldebug-option-to-common_argparse-to-avoid.patch b/debian/patches/extra/0001-argv-move-nldebug-option-to-common_argparse-to-avoid.patch
new file mode 100644 (file)
index 0000000..f02574f
--- /dev/null
+++ b/debian/patches/extra/0001-argv-move-nldebug-option-to-common_argparse-to-avoid.patch
@@ -0,0 +1,44 @@
+From 8e9960454d58f648547fcb086a8b4352a4aa4faa Mon Sep 17 00:00:00 2001
+From: Julien Fortin <julien@cumulusnetworks.com>
+Date: Tue, 31 Dec 2019 20:25:44 +0100
+Subject: [PATCH] argv: move --nldebug option to common_argparse to avoid
+ exception in ifreload
+
+Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ ifupdown2/ifupdown/argv.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ifupdown2/ifupdown/argv.py b/ifupdown2/ifupdown/argv.py
+index e560b40..a96a390 100644
+--- a/ifupdown2/ifupdown/argv.py
++++ b/ifupdown2/ifupdown/argv.py
+@@ -148,13 +148,6 @@ class Parse:
+                                help='type of interface entry (iface or vlan). '
+                                     'This option can be used in case of ambiguity between '
+                                     'a vlan interface and an iface interface of the same name')
+-        argparser.add_argument(
+-            "--nldebug",
+-            dest="nldebug",
+-            action="store_true",
+-            default=False,
+-            help="print netlink debug messages"
+-        )
+ 
+     def update_ifupdown_argparser(self, argparser):
+         """ common arg parser for ifup and ifdown """
+@@ -248,3 +241,10 @@ class Parse:
+         ''' general parsing rules '''
+ 
+         argparser.add_argument('-V', '--version', action=VersionAction, nargs=0)
++        argparser.add_argument(
++            "--nldebug",
++            dest="nldebug",
++            action="store_true",
++            default=False,
++            help="print netlink debug messages"
++        )
+-- 
+2.20.1
+

diff --git a/debian/patches/series b/debian/patches/series
index 145484cc50012733b8b2b2d09d04a9277d3297d9..41aafb76dc818ffa82a096a8e315c0c597f06fd3 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+extra/0001-argv-move-nldebug-option-to-common_argparse-to-avoid.patch
 pve/0001-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch
 pve/0002-add-dummy-mtu-bridgevlanport-modules.patch
 pve/0003-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch