Merge pull request #236 from yast/grub1_crash

Grub1 crash
yast · Jun 1, 2015 · 6167da9 · 6167da9
2 parents f5c8af4 + f4ce51c
commit 6167da9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun  1 14:20:30 UTC 2015 - jreidinger@suse.com
+
+- Don't crash when reconfiguring from grub1 to grub2 (bnc#923458)
+- 3.1.129
+
 -------------------------------------------------------------------
 Wed May 20 13:35:23 CEST 2015 - dvaleev@suse.com
 

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

diff --git a/src/include/bootloader/routines/dialogs.rb b/src/include/bootloader/routines/dialogs.rb
@@ -128,7 +128,7 @@ def MainDialog
 
       )
       if ret != :back && ret != :abort && ret != :cancel
-        @return_tab = CWMTab.LastTab
+        @return_tab = CWMTab.LastTab || "tab"
         @return_tab = "installation" if @return_tab.include? "tab" # workaround different tab set for grub2
       end
       ret

diff --git a/src/lib/bootloader/grub2base.rb b/src/lib/bootloader/grub2base.rb
@@ -57,7 +57,8 @@ def pmbr_setup(action, *devices)
     def StandardGlobals
       # s390 do not have os_prober, see bnc#868909#c2
       # ppc have slow os_prober, see boo#931653
-      disable_os_prober = (Arch.s390||Arch.ppc) || ProductFeatures.GetBooleanFeature("globals", "disable_os_prober")
+      disable_os_prober = (Arch.s390 || Arch.ppc) ||
+        ProductFeatures.GetBooleanFeature("globals", "disable_os_prober")
       {
         "timeout"   => "8",
         "default"   => "0",