[yast-commit] r67984 - in /trunk/bootloader/src: grub2/Makefile.am grub2/dialogs.ycp modules/BootGRUB2.ycp routines/global_widgets.ycp

Author: snwint Date: Mon Apr 23 11:46:27 2012 New Revision: 67984 URL: http://svn.opensuse.org/viewcvs/yast?rev=67984&view=rev Log: - add "Boot Loader Options" dialog for grub2 that provides widgets for manipulating global options. These options include activate, generic_mbr, timeout, vgamode, append and default. Modified: trunk/bootloader/src/grub2/Makefile.am trunk/bootloader/src/grub2/dialogs.ycp trunk/bootloader/src/modules/BootGRUB2.ycp trunk/bootloader/src/routines/global_widgets.ycp Modified: trunk/bootloader/src/grub2/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub2/Makefile.am?rev=67984&r1=67983&r2=67984&view=diff ============================================================================== --- trunk/bootloader/src/grub2/Makefile.am (original) +++ trunk/bootloader/src/grub2/Makefile.am Mon Apr 23 11:46:27 2012 @@ -4,8 +4,10 @@ yncludedir = @yncludedir@/bootloader/grub2 -ynclude_DATA = \ - dialogs.ycp +ynclude_DATA = \ + dialogs.ycp \ + options.ycp \ + helps.ycp EXTRA_DIST = \ $(ynclude_DATA) Modified: trunk/bootloader/src/grub2/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub2/dialogs.ycp?rev=67984&r1=67983&r2=67984&view=diff ============================================================================== --- trunk/bootloader/src/grub2/dialogs.ycp (original) +++ trunk/bootloader/src/grub2/dialogs.ycp Mon Apr 23 11:46:27 2012 @@ -26,6 +26,46 @@ import "BootCommon"; import "Stage"; +include "bootloader/grub2/options.ycp"; + +/** + * Run dialog for loader installation details for Grub2 + * @return symbol for wizard sequencer + */ +symbol Grub2LoaderDetailsDialog () +{ + y2milestone ("Running Grub2 loader details dialog"); + term contents = `HBox ( + `HSpacing (2), + `VBox ( + `VStretch (), + `Left("activate"), + `Left("generic_mbr"), + `Left("hiddenmenu"), + `HBox ( + `Left(`HSquash("timeout")), + `Left(`HWeight(1, "vgamode")) + ), + `Left("append"), + `Left("default"), + `VStretch () + ), + `HSpacing (2) + ); + + list<string> widget_names = ["activate","generic_mbr", "hiddenmenu", "timeout", "append", "vgamode", "default"]; + string caption = _("Boot Loader Options"); + return CWM::ShowAndRun ($[ + "widget_descr" : Grub2Options(), + "widget_names" : widget_names, + "contents" : contents, + "caption" : caption, + "back_button" : Label::BackButton (), + "abort_button" : Label::CancelButton (), + "next_button" : Label::OKButton (), + ]); +} + include "bootloader/grub/options.ycp"; /** Modified: trunk/bootloader/src/modules/BootGRUB2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB2.ycp?rev=67984&r1=67983&r2=67984&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootGRUB2.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB2.ycp Mon Apr 23 11:46:27 2012 @@ -43,6 +43,16 @@ // general functions /** + * Propose global options of bootloader + */ +global map StandardGlobals () { + return $[ + "timeout" : "8", + "default" : "0", + ]; +} + +/** * Read settings from disk * @param reread boolean true to force reread settings from system * @param avoid_reading_device_map do not read new device map from file, use @@ -121,6 +131,12 @@ global define void Propose () { y2milestone ("Proposed globals: %1", BootCommon::globals); + + if (BootCommon::globals == nil || size (BootCommon::globals) == 0) + { + BootCommon::globals = StandardGlobals(); + } + grub_LocationProposal (); map swap_sizes = BootCommon::getSwapPartitions (); @@ -177,6 +193,13 @@ return result; } +global map Dialogs () { + y2milestone ("Called GRUB2 Dialogs"); + return $[ + "loader" : Grub2LoaderDetailsDialog, + ]; +} + /** * Return map of provided functions * @return a map of functions (eg. $["write":BootGRUB2::Write]) @@ -189,6 +212,7 @@ "summary" : Summary, "update" : Update, "widgets" : grub2Widgets, + "dialogs" : Dialogs, "write" : Write, ]; } Modified: trunk/bootloader/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/global_widgets.ycp?rev=67984&r1=67983&r2=67984&view=diff ============================================================================== --- trunk/bootloader/src/routines/global_widgets.ycp (original) +++ trunk/bootloader/src/routines/global_widgets.ycp Mon Apr 23 11:46:27 2012 @@ -736,7 +736,7 @@ `HStretch (), `VBox ( `Label (""), - (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2" || lt == "grub2-efi") + (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2-efi") ? `Empty() : "loader_options" ), `HSpacing (2) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org