[pve-devel] [PATCH ifupdown2] add missing patch from master-next

[Alexandre Derumier]

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 ...60454d58f648547fcb086a8b4352a4aa4faa.patch | 40 +++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 debian/patches/extra/8e9960454d58f648547fcb086a8b4352a4aa4faa.patch

diff --git a/debian/patches/extra/8e9960454d58f648547fcb086a8b4352a4aa4faa.patch b/debian/patches/extra/8e9960454d58f648547fcb086a8b4352a4aa4faa.patch
new file mode 100644
index 0000000..b0ae36c
--- /dev/null
+++ b/debian/patches/extra/8e9960454d58f648547fcb086a8b4352a4aa4faa.patch
@@ -0,0 +1,40 @@
+From 8e9960454d58f648547fcb086a8b4352a4aa4faa Mon Sep 17 00:00:00 2001
+From: Julien Fortin <julien at 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 at cumulusnetworks.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 @@ def update_argparser(self, argparser):
+                                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 @@ def update_common_argparser(self, argparser):
+         ''' 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"
++        )
diff --git a/debian/patches/series b/debian/patches/series
index 145484c..418f962 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ pve/0003-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch
 pve/0004-don-t-remove-bridge-is-tap-veth-are-still-plugged.patch
 pve/0005-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
 pve/0006-config-tuning.patch
+extra/8e9960454d58f648547fcb086a8b4352a4aa4faa.patch
-- 
2.20.1