Merge pull request #444 from yast/fix_nil_hd0

Fix nil hd0
yast · Jul 7, 2017 · bbb2b7a · bbb2b7a
2 parents 391b27f + 0668d29
commit bbb2b7a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul  7 11:00:48 UTC 2017 - jreidinger@suse.com
+
+- Backport: Do not crash if all devices have defined bios_id, but
+  none is the first one (bsc#1043759)
+- 3.1.212
+
 -------------------------------------------------------------------
 Wed Jul  5 08:56:43 CEST 2017 - schubi@suse.de
 

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

diff --git a/src/lib/bootloader/device_map.rb b/src/lib/bootloader/device_map.rb
@@ -203,7 +203,9 @@ def change_order(priority_device)
       remove_mapping("hd0")
       remove_mapping(grub_dev)
       add_mapping("hd0", priority_device)
-      add_mapping(grub_dev, replaced_dev)
+      # switch order only if there was previously device at hd0. It can be empty e.g.
+      # if bios_id is defined, but not for 0x80
+      add_mapping(grub_dev, replaced_dev) if replaced_dev
     end
 
     # Check if MD raid is build on disks not on paritions