Merge branch 'SLE-15-SP6' into merge_SLE-15-SP6

yast · Dec 14, 2023 · e2d3899 · e2d3899
2 parents b8ed5bd + 81845f4
commit e2d3899
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec 13 12:07:00 UTC 2023 - Knut Alejandro Anderssen González <kanderssen@suse.com>
+
+- Read all the driver modules from hwinfo instead of just the first
+  driver ones (bsc#1217652).
+- 5.0.1
+
 -------------------------------------------------------------------
 Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <jreidinger@suse.cz>
 

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

diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb
@@ -230,10 +230,10 @@ def merge!(other)
     #
     # @return [Array<Driver>] List of drivers
     def drivers
-      driver = @hwinfo.fetch("drivers", []).first
-      return [] unless driver
+      drivers = @hwinfo.fetch("drivers", [])
+      return [] unless drivers.first
 
-      modules = driver.fetch("modules", [])
+      modules = drivers.map { |d| d.fetch("modules", []).flatten }
       modules.map { |m| Driver.new(*m) }
     end
 

diff --git a/test/data/hardware.yml b/test/data/hardware.yml
@@ -15,6 +15,11 @@
     modules:
     - - virtio_net
       - ''
+  - active: false
+    modprobe: true
+    modules:
+    - - virtio_net_test
+      - ''
   active: true
   module: virtio_net
   options: ''

diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb
@@ -100,7 +100,7 @@
   describe "#drivers" do
     it "returns the list of kernel modules names" do
       expect(hwinfo.drivers).to eq(
-        [Y2Network::Driver.new("virtio_net", "")]
+        [Y2Network::Driver.new("virtio_net", ""), Y2Network::Driver.new("virtio_net_test", "")]
       )
     end
   end