bsc#1059757: filter out multipath wires from devices

yast · Nov 7, 2017 · afc5b68 · afc5b68
1 parent ea3716e
commit afc5b68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/lib/bootloader/device_map.rb b/src/lib/bootloader/device_map.rb
@@ -132,7 +132,7 @@ def fill_mapping
       # mapping entry per disk for the time being (see commented code for the
       # real expected behavior)
       staging = Y2Storage::StorageManager.instance.staging
-      staging.disks.each_with_index do |disk, index|
+      staging.disk_devices.each_with_index do |disk, index|
         add_mapping("hd#{index}", disk.name)
       end
 # rubocop:disable Style/BlockComments

diff --git a/src/lib/bootloader/udev_mapping.rb b/src/lib/bootloader/udev_mapping.rb
@@ -80,8 +80,8 @@ def udev_to_kernel(dev)
       return dev if Yast::Mode.config
 
       devices = Y2Storage::BlkDevice.all(staging)
+      devices.reject! { |d| d.is?(:disk) && d.descendants.any? { |i| i.is?(:multipath) } }
       device = devices.find { |i| i.udev_full_all.include?(dev) }
-
       return device.name if device
 
       # TRANSLATORS: error message, %s stands for problematic device.