s390 secure boot: enhance disk type detection to cover multipath (bsc…

…#1171821)
yast · May 25, 2020 · 2a99939 · 2a99939
1 parent 414d9d0
commit 2a99939
Showing 1 changed file with 4 additions and 4 deletions.
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