From 16dde604a1605e0a49caa818467b7d36285c7a65 Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Thu, 4 Jan 2024 12:21:52 +0200 Subject: [PATCH] Fix network spokes connectivity check Since NetworkManager 1.41.6 or RHEL 9.2, NM manages lo, so GetActivatedInterfaces() returns at least ['lo']. Use 'Connected' as that's we really want to know anyway. Signed-off-by: Etienne Champetier --- pyanaconda/ui/gui/spokes/network.py | 4 ++-- pyanaconda/ui/tui/spokes/network.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index 91130b44029..716b551a518 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -1540,7 +1540,7 @@ def completed(self): # TODO: check also if source requires updates when implemented # If we can't configure network, don't require it return (not conf.system.can_configure_network - or self._network_module.GetActivatedInterfaces()) + or self._network_module.Connected) @property def mandatory(self): @@ -1691,7 +1691,7 @@ def apply(self): @property def completed(self): return (not conf.system.can_configure_network - or self._network_module.GetActivatedInterfaces() + or self._network_module.Connected or not (self.payload.source_type != conf.payload.default_source and self.payload.needs_network)) diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py index 3000762ca68..6ad3b6353bb 100644 --- a/pyanaconda/ui/tui/spokes/network.py +++ b/pyanaconda/ui/tui/spokes/network.py @@ -255,7 +255,7 @@ def completed(self): """ Check whether this spoke is complete or not.""" # If we can't configure network, don't require it return (not conf.system.can_configure_network - or self._network_module.GetActivatedInterfaces()) + or self._network_module.Connected) @property def mandatory(self):