From bc8756e9f90c5bb1de8f0ce95f04f1c495e41355 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 26 Jul 2018 12:23:45 +0200 Subject: [PATCH] make bsc#1098594 regression test work on s390 This fixes the bsc#1098594 regression unit test in test/y2storage/autoinst_profile/partitioning_section_test.rb as otherwise drive.device would be nil on s390. --- src/lib/y2storage/autoinst_profile/drive_section.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/y2storage/autoinst_profile/drive_section.rb b/src/lib/y2storage/autoinst_profile/drive_section.rb index 9561cdda38..e8e1ff7172 100644 --- a/src/lib/y2storage/autoinst_profile/drive_section.rb +++ b/src/lib/y2storage/autoinst_profile/drive_section.rb @@ -204,7 +204,10 @@ def init_from_disk(disk) return false if disk.partitions.empty? @type = :CT_DISK + # FIXME: could anyone with knowledge leave a comment why s390 is special here? @device = Yast::Arch.s390 ? disk.udev_full_paths.first : disk.name + # if disk.udev_full_paths.first is nil go for disk.name anyway + @device ||= disk.name @disklabel = disk.partition_table.type.to_s @partitions = partitions_from_disk(disk)