Merge 053d573 into 39c2fda

yast · Nov 29, 2016 · a457c05 · a457c05
2 parents 39c2fda + 053d573
commit a457c05
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 09:17:26 UTC 2016 - jreidinger@suse.com
+
+- do not crash for empty device partition like partitions living
+  on /dev/loop (bsc#986124)
+- 3.1.162.1
+
 -------------------------------------------------------------------
 Fri Nov 27 14:46:57 CET 2015 - snwint@suse.de
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        3.1.162
+Version:        3.1.162.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/BootStorage.rb b/src/modules/BootStorage.rb
@@ -160,6 +160,7 @@ def InitDiskInfo
         parts = partitions.map do |p|
           raid = p["used_by_type"] == :UB_MD ? p["used_by_device"] : nil
           device = p["device"] || ""
+          next nil if device.empty?
           # We only pass along RAID1 devices as all other causes
           # severe breakage in the bootloader stack
           @md_info[raid] << device if raid && @md_info.include?(raid)
@@ -178,7 +179,7 @@ def InitDiskInfo
             ::Bootloader::UdevMapping.to_mountby_device(device)
           ]
         end
-        res.concat(parts)
+        res.concat(parts.compact)
       end
     end