fix name on nil

yast · Apr 20, 2017 · b27c93b · b27c93b
1 parent 6fd9bdc
commit b27c93b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/lib/bootloader/stage1.rb b/src/lib/bootloader/stage1.rb
@@ -120,13 +120,13 @@ def extended_partition?
 
     def custom_devices
       known_devices = [
-        Yast::BootStorage.boot_partition.name,
-        Yast::BootStorage.root_partition.name,
-        Yast::BootStorage.mbr_disk.name,
-        Yast::BootStorage.extended_partition.name
+        Yast::BootStorage.boot_partition,
+        Yast::BootStorage.root_partition,
+        Yast::BootStorage.mbr_disk,
+        Yast::BootStorage.extended_partition
       ]
-      known_devices.compact!
-      known_devices.map! { |d| Bootloader::UdevMapping.to_kernel_device(d) }
+      known_devices.compact! # extended partition can be nil
+      known_devices.map! { |d| Bootloader::UdevMapping.to_kernel_device(d.name) }
 
       devices.select do |dev|
         !known_devices.include?(Bootloader::UdevMapping.to_kernel_device(dev))