From d4866bf76574a436372204583f4194ca01beb265 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Tue, 19 Nov 2019 11:34:03 -0500 Subject: [PATCH 03/37] fix: reload: let NM interface assignments override permanent config Use the change interface call instead of add interface. This lets NM override the permanent interface assignment. Fixes: rhbz 1773809 (cherry picked from commit a3265daf5b8092878e82fc7840e56bb0b36a43ea) (cherry picked from commit 48bde3b3343cbdd35af58958467b8e64e10f3821) --- src/firewall/core/fw.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/firewall/core/fw.py b/src/firewall/core/fw.py index 4dc6a4f47aff..050fb9cd976d 100644 --- a/src/firewall/core/fw.py +++ b/src/firewall/core/fw.py @@ -988,7 +988,7 @@ class Firewall(object): if nm_bus_name: for zone in self.zone.get_zones() + [""]: for interface in nm_get_interfaces_in_zone(zone): - self.zone.add_interface(zone, interface, sender=nm_bus_name) + self.zone.change_zone_of_interface(zone, interface, sender=nm_bus_name) self._panic = _panic if not self._panic: -- 2.23.0