From 1007fdeb3247021395c0b885b49258e82915f778 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 12 Jun 2017 13:00:39 +0200 Subject: [PATCH 1/3] avoid nil device in device map --- src/lib/bootloader/device_map.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/bootloader/device_map.rb b/src/lib/bootloader/device_map.rb index 9c8415659..c0a9d6ad6 100644 --- 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 From 85727f1d0f4f00b92ca6eb2dfc6f4ac3d146faf8 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 12 Jun 2017 13:01:45 +0200 Subject: [PATCH 2/3] changes --- package/yast2-bootloader.changes | 7 +++++++ package/yast2-bootloader.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes index 80e4d5bcb..7b2a3eb34 100644 --- a/package/yast2-bootloader.changes +++ b/package/yast2-bootloader.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 12 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 index 415a08a0e..dfd68cc8a 100644 --- 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 From 0668d29953f4ab7a317ef0be1bf78205c813a149 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 7 Jul 2017 12:49:24 +0200 Subject: [PATCH 3/3] changelog in sequence --- package/yast2-bootloader.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes index 7b2a3eb34..64bac6215 100644 --- a/package/yast2-bootloader.changes +++ b/package/yast2-bootloader.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Jun 12 11:00:48 UTC 2017 - jreidinger@suse.com +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)