mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code

addons: address: process hwaddress before processing ip addresses

Browse Source 
Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2022-09-20 02:29:10 +02:00
parent aa656ad315
commit 86bd267c63
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ifupdown2/addons/address.py
View File

@ -1079,6 +1079,11 @@ class address(AddonWithIpBlackList, moduleBase):
self.process_mtu(ifaceobj, ifaceobj_getfunc) self.process_mtu(ifaceobj, ifaceobj_getfunc)
self.up_ipv6_addrgen(ifaceobj) self.up_ipv6_addrgen(ifaceobj)
try:
hwaddress, old_mac_addr = self.process_hwaddress(ifaceobj)
except Exception as e:
self.log_error('%s: %s' % (ifaceobj.name, str(e)), ifaceobj)
if addr_method not in ["dhcp", "ppp"]: if addr_method not in ["dhcp", "ppp"]:
self.process_addresses(ifaceobj, ifaceobj_getfunc, force_reapply) self.process_addresses(ifaceobj, ifaceobj_getfunc, force_reapply)
else: else:
@ -1091,7 +1096,7 @@ class address(AddonWithIpBlackList, moduleBase):
try: try:
# Handle special things on a bridge # Handle special things on a bridge
self._process_bridge(ifaceobj, True, *self.process_hwaddress(ifaceobj)) self._process_bridge(ifaceobj, True, hwaddress, old_mac_addr)
except Exception as e: except Exception as e:
self.log_error('%s: %s' % (ifaceobj.name, str(e)), ifaceobj) self.log_error('%s: %s' % (ifaceobj.name, str(e)), ifaceobj)