[pve-devel] [PATCH ifupdown2 1/9] remove extra patches
Alexandre Derumier
aderumier at odiso.com
Thu May 28 14:33:17 CEST 2020
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
...g-option-to-common_argparse-to-avoid.patch | 44 --------
.../extra/0002-fix-default-forwarding.patch | 100 ------------------
debian/patches/series | 2 -
3 files changed, 146 deletions(-)
delete mode 100644 debian/patches/extra/0001-argv-move-nldebug-option-to-common_argparse-to-avoid.patch
delete mode 100644 debian/patches/extra/0002-fix-default-forwarding.patch
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
deleted file mode 100644
index f02574f..0000000
--- a/debian/patches/extra/0001-argv-move-nldebug-option-to-common_argparse-to-avoid.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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>
-Signed-off-by: Thomas Lamprecht <t.lamprecht at 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/extra/0002-fix-default-forwarding.patch b/debian/patches/extra/0002-fix-default-forwarding.patch
deleted file mode 100644
index c1a72a3..0000000
--- a/debian/patches/extra/0002-fix-default-forwarding.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 85a93e870777f774e5901bd4443ddff2e8eaa444 Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier at odiso.com>
-Date: Mon, 24 Feb 2020 15:18:56 +0100
-Subject: [PATCH] fix default forwarding
-
-Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
----
- ifupdown2/addons/address.py | 70 +++++++++++++++++++++----------------
- 1 file changed, 40 insertions(+), 30 deletions(-)
-
-diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py
-index 83974d7..b9a16ee 100644
---- a/ifupdown2/addons/address.py
-+++ b/ifupdown2/addons/address.py
-@@ -821,42 +821,52 @@ class address(Addon, moduleBase):
- 'bridge port' %ifaceobj.name)
- return
- setting_default_value = False
-+
-+
- if not ipforward:
- setting_default_value = True
-- ipforward = (self.ipforward or
-- self.get_mod_subattr('ip-forward', 'default'))
-- ipforward = int(utils.get_boolean_from_string(ipforward))
-- running_ipforward = self.cache.get_netconf_forwarding(socket.AF_INET, ifaceobj.name)
-- if ipforward != running_ipforward:
-- try:
-- self.sysctl_set('net.ipv4.conf.%s.forwarding'
-- %('/'.join(ifaceobj.name.split("."))),
-- ipforward)
-- except Exception as e:
-- if not setting_default_value:
-- ifaceobj.status = ifaceStatus.ERROR
-- self.logger.error('%s: %s' %(ifaceobj.name, str(e)))
-+ ipforward = self.ipforward
-+
-+ if ipforward:
-+
-+ ipforward = int(utils.get_boolean_from_string(ipforward))
-+ running_ipforward = self.cache.get_netconf_forwarding(socket.AF_INET, ifaceobj.name)
-+
-+ if ipforward != running_ipforward:
-+ try:
-+ self.sysctl_set('net.ipv4.conf.%s.forwarding'
-+ %('/'.join(ifaceobj.name.split("."))),
-+ ipforward)
-+ except Exception as e:
-+ if not setting_default_value:
-+ ifaceobj.status = ifaceStatus.ERROR
-+ self.logger.error('%s: %s' %(ifaceobj.name, str(e)))
-
- setting_default_value = False
-+
-+
- if not ip6forward:
- setting_default_value = True
-- ip6forward = (self.ip6forward or
-- self.get_mod_subattr('ip6-forward', 'default'))
-- ip6forward = int(utils.get_boolean_from_string(ip6forward))
-- running_ip6forward = self.cache.get_netconf_forwarding(socket.AF_INET6, ifaceobj.name)
-- if ip6forward != running_ip6forward:
-- try:
-- self.sysctl_set('net.ipv6.conf.%s.forwarding'
-- %('/'.join(ifaceobj.name.split("."))),
-- ip6forward)
-- except Exception as e:
-- # There is chance of ipv6 being removed because of,
-- # for example, setting mtu < 1280
-- # In such cases, log error only if user has configured
-- # ip6-forward
-- if not setting_default_value:
-- ifaceobj.status = ifaceStatus.ERROR
-- self.logger.error('%s: %s' %(ifaceobj.name, str(e)))
-+ ip6forward = self.ip6forward
-+
-+ if ip6forward:
-+
-+ ip6forward = int(utils.get_boolean_from_string(ip6forward))
-+ running_ip6forward = self.cache.get_netconf_forwarding(socket.AF_INET6, ifaceobj.name)
-+
-+ if ip6forward != running_ip6forward:
-+ try:
-+ self.sysctl_set('net.ipv6.conf.%s.forwarding'
-+ %('/'.join(ifaceobj.name.split("."))),
-+ ip6forward)
-+ except Exception as e:
-+ # There is chance of ipv6 being removed because of,
-+ # for example, setting mtu < 1280
-+ # In such cases, log error only if user has configured
-+ # ip6-forward
-+ if not setting_default_value:
-+ ifaceobj.status = ifaceStatus.ERROR
-+ self.logger.error('%s: %s' %(ifaceobj.name, str(e)))
-
- def process_mtu(self, ifaceobj, ifaceobj_getfunc):
- mtu_str = ifaceobj.get_attr_value_first('mtu')
---
-2.20.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 2fc0b0d..17eb6b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-extra/0001-argv-move-nldebug-option-to-common_argparse-to-avoid.patch
-extra/0002-fix-default-forwarding.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
--
2.20.1
More information about the pve-devel
mailing list