From 86bd267c636da23f018842fb6373ee1da40046f1 Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Tue, 20 Sep 2022 02:29:10 +0200 Subject: [PATCH] addons: address: process hwaddress before processing ip addresses Signed-off-by: Julien Fortin --- ifupdown2/addons/address.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py index feedfb8..75c5d0e 100644 --- a/ifupdown2/addons/address.py +++ b/ifupdown2/addons/address.py @@ -1079,6 +1079,11 @@ class address(AddonWithIpBlackList, moduleBase): self.process_mtu(ifaceobj, ifaceobj_getfunc) 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"]: self.process_addresses(ifaceobj, ifaceobj_getfunc, force_reapply) else: @@ -1091,7 +1096,7 @@ class address(AddonWithIpBlackList, moduleBase): try: # 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: self.log_error('%s: %s' % (ifaceobj.name, str(e)), ifaceobj)