Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Grub1 crash #236

Merged
merged 4 commits into from
Jun 1, 2015
Merged

Grub1 crash #236

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e143838
do not crash if last tab do not exists (bnc#923458)
jreidinger Jun 1, 2015
1cb3ce0
changes
jreidinger Jun 1, 2015
dd59501
make rubocop happy
jreidinger Jun 1, 2015
f4ce51c
better changelog message (thanks to mvidner)
jreidinger Jun 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions package/yast2-bootloader.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jun 1 14:20:30 UTC 2015 - jreidinger@suse.com

- do not crash if last tab do not exists like for non-supported
bootloader (bnc#923458)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is too implementation oriented. What are the user visible circumstances? The bug title "Startup of YaST bootloader fails" is also too generic to be helpful.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should for unsupported bootloader that it do not show red popup with crash :)

- 3.1.129

-------------------------------------------------------------------
Wed May 20 13:35:23 CEST 2015 - dvaleev@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-bootloader.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-bootloader
Version: 3.1.128
Version: 3.1.129
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down
2 changes: 1 addition & 1 deletion src/include/bootloader/routines/dialogs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def MainDialog

)
if ret != :back && ret != :abort && ret != :cancel
@return_tab = CWMTab.LastTab
@return_tab = CWMTab.LastTab || "tab"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So "tab" is both the id of an existing Tab widget, and a fake name of a non-existing tab?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is a bit tricky. In grub2 due to different design it do not exists, so it is replaced by installation tab. So I use it here as default value.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, could we use "fake_tab" here...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no as fake_tab do not exist, it should be existing id value

@return_tab = "installation" if @return_tab.include? "tab" # workaround different tab set for grub2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and "_tab" here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no as tab is proposed as initial tag elsewhere in code. So different part of code propose as default return_tab "tab" and here it is changed to grub2 default return tab..it is just relict of old multi-bootloader code that have here condition if bootloader == "grub2" && which is now useless. It deserve more cleaning but it is not part of this pr and I hope it will be cleaned together with perl-bootloader support drop off

end
ret
Expand Down
3 changes: 2 additions & 1 deletion src/lib/bootloader/grub2base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down