Merge pull request #1357 from yast/merge_SLE-15-SP5

Do not consider firmware configured interfaces as bridgeable ones (SLE-15-SP6)
yast · Feb 7, 2024 · 9b0050d · 9b0050d
2 parents a635653 + c9aa974
commit 9b0050d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 16 10:34:01 UTC 2024 - Knut Anderssen  <[email protected]>
+
+- Consider firmware configured interfaces as non bridgeable
+  (bsc#1218595).
+- 4.6.8
+
 -------------------------------------------------------------------
 Wed Dec 13 12:07:00 UTC 2023 - Knut Alejandro Anderssen González <[email protected]>
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.6.7
+Version:        4.6.8
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb
@@ -99,6 +99,8 @@ def interfaces
       def bridgeable?(iface)
         # cannot report itself
         return false if iface.name == @name
+        # Do not add firmware configured interfaces (bsc#1218595)
+        return false if iface.firmware_configured?
         return true unless yast_config.configured_interface?(iface.name)
 
         config = yast_config.connections.by_name(iface.name)