mirror of
https://github.com/CumulusNetworks/ifupdown2.git
synced 2024-05-06 15:54:50 +00:00
Merge branch 'master' into python3
* master: addons: address: process MTU before addrgen and adddresses ifupdownmain: support for marking interfaces as mgmt interfaces addons: bridge: fix TypeError: sequence item 0: expected string, int found addons: bridge: set bridge MTU after bridge creation addons: bridge: get bridge MTU from address policy not bridge addons: mstpctl: check mstpctl-stp and bridge-stp and fix bridge cache update lib: nlcache: fix dry_run exception addons: address: add support for a separate default mtu policy for eth interfaces debian: changelog: new 2.0.2-1 entry addons: ethtool: add support for "ethtool_ignore_errors" policy LinkUtils: mac_str_to_int: fix string to int conversion addons: dhcp: if mgmt vrf context exec dhclient in default vrf
This commit is contained in:
@@ -971,6 +971,7 @@ class address(Addon, moduleBase):
|
||||
except:
|
||||
pass
|
||||
|
||||
self.process_mtu(ifaceobj, ifaceobj_getfunc)
|
||||
self.up_ipv6_addrgen(ifaceobj)
|
||||
|
||||
if addr_method not in ["dhcp", "ppp"]:
|
||||
@@ -982,7 +983,6 @@ class address(Addon, moduleBase):
|
||||
for addr in old_ifaceobj.get_attr_value("address") or []:
|
||||
self.netlink.addr_del(ifaceobj.name, ipnetwork.IPNetwork(addr))
|
||||
|
||||
self.process_mtu(ifaceobj, ifaceobj_getfunc)
|
||||
|
||||
try:
|
||||
self.process_hwaddress(ifaceobj)
|
||||
|
Reference in New Issue
Block a user