Merge f6fd5f0 into 414d9d0

yast · May 25, 2020 · 7a22459 · 7a22459
2 parents 414d9d0 + f6fd5f0
commit 7a22459
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 25 15:00:44 UTC 2020 - Steffen Winterfeldt <snwint@suse.com>
+
+- s390 secure boot: enhance disk type detection to cover multipath
+  (bsc#1171821)
+- 4.3.2
+
 -------------------------------------------------------------------
 Thu May  7 12:53:53 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.3.1
+Version:        4.3.2
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later

diff --git a/src/lib/bootloader/systeminfo.rb b/src/lib/bootloader/systeminfo.rb
@@ -139,10 +139,10 @@ def zipl_device
       #
       # @return [Boolean] true if device is a SCSI device
       def scsi?(device)
-        # in lack of a better idea: check if device name starts with 'sd'
-        # alternatively: device.udev_ids.any?(/^scsi-/)
-        # or: device.udev_paths.any?(/-zfcp-/)
-        device.name.start_with?("/dev/sd")
+        # checking if device name starts with 'sd' is not enough: it could
+        # be a device mapper target (e.g. multipath)
+        # see bsc#1171821
+        device.name.start_with?("/dev/sd") || device.udev_ids.any?(/^scsi-/)
       rescue StandardError
         false
       end