diff --git a/package/yast2-network.changes b/package/yast2-network.changes index 541c997a1..7f9f789ff 100644 --- 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 + +- Read all the driver modules from hwinfo instead of just the first + driver ones (bsc#1217652). +- 4.6.7 + ------------------------------------------------------------------- Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger diff --git a/package/yast2-network.spec b/package/yast2-network.spec index 38a2ebcb8..b22269aec 100644 --- a/package/yast2-network.spec +++ b/package/yast2-network.spec @@ -17,7 +17,7 @@ Name: yast2-network -Version: 4.6.6 +Version: 4.6.7 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 index 1e239a893..c8817a3b5 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -230,10 +230,10 @@ def merge!(other) # # @return [Array] 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 index 09d9a31cb..9d82d4aa2 100644 --- 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 index 14f98e545..2a2582132 100644 --- 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