Skip to content

Commit

Permalink
Allow change disk order for grub2
Browse files Browse the repository at this point in the history
Fix YaST doesn't allow to change disk order when grub2 is choosen as
bootloader (bnc#785569)
  • Loading branch information
WenhuaChang committed Jan 4, 2013
1 parent 4d5a12c commit e3f7486
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
22 changes: 22 additions & 0 deletions src/grub2/dialogs.ycp
Expand Up @@ -84,6 +84,28 @@ symbol Grub2LoaderDetailsDialog ()

include "bootloader/grub/options.ycp";

/**
* Run dialog to adjust installation on i386 and AMD64
* @return symbol for wizard sequencer
*/
symbol Grub2InstallDetailsDialog () {
term contents = `HBox (`HStretch (), `VBox (
`VStretch(),
`Frame (_("Disk Order"),"disks_order"),
`VStretch()),
`HStretch());

return CWM::ShowAndRun ($[
"widget_descr": $[ "disks_order": DisksOrderWidget()],
"widget_names": ["disks_order"],
"contents": contents,
"caption" : _("Disk order settings"),
"back_button" : Label::BackButton (),
"abort_button" : Label::CancelButton (),
"next_button" : Label::OKButton ()
]);
}

/**
* Cache for genericWidgets function
*/
Expand Down
1 change: 1 addition & 0 deletions src/modules/BootGRUB2.ycp
Expand Up @@ -208,6 +208,7 @@ global define list<string> Summary () {
global map<string,symbol()> Dialogs () {
y2milestone ("Called GRUB2 Dialogs");
return $[
"installation" : Grub2InstallDetailsDialog,
"loader" : Grub2LoaderDetailsDialog,
];
}
Expand Down
2 changes: 1 addition & 1 deletion src/routines/global_widgets.ycp
Expand Up @@ -748,7 +748,7 @@ map TabsDescr () {
? `Empty ()
: "loader_location",
`VStretch (),
(lt != "grub")
(lt != "grub" && lt != "grub2")
? `Empty ()
: "inst_details",
`VStretch ()
Expand Down

0 comments on commit e3f7486

Please sign in to comment.