[yast-commit] r67986 - in /trunk/bootloader/src: grub2/dialogs.ycp modules/BootGRUB2EFI.ycp routines/global_widgets.ycp

Author: snwint Date: Mon Apr 23 11:50:12 2012 New Revision: 67986 URL: http://svn.opensuse.org/viewcvs/yast?rev=67986&view=rev Log: - add "Boot Loader Options" dialog for grub2-efi that provides widgets for manipulating global options. These options include timeout, vgamode, append and default. Modified: trunk/bootloader/src/grub2/dialogs.ycp trunk/bootloader/src/modules/BootGRUB2EFI.ycp trunk/bootloader/src/routines/global_widgets.ycp Modified: trunk/bootloader/src/grub2/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub2/dialogs.ycp?rev=67986&r1=67985&r2=67986&view=diff ============================================================================== --- trunk/bootloader/src/grub2/dialogs.ycp (original) +++ trunk/bootloader/src/grub2/dialogs.ycp Mon Apr 23 11:50:12 2012 @@ -54,7 +54,11 @@ `HSpacing (2) ); - list<string> widget_names = ["activate","generic_mbr", "hiddenmenu", "timeout", "append", "console", "default", "vgamode"]; + string lt = BootCommon::getLoaderType (false); + list<string> widget_names = (lt == "grub2-efi") + ? ["hiddenmenu", "timeout", "append", "default", "vgamode"] + : ["activate","generic_mbr", "hiddenmenu", "timeout", "append", "console", "default", "vgamode"]; + string caption = _("Boot Loader Options"); return CWM::ShowAndRun ($[ "widget_descr" : Grub2Options(), Modified: trunk/bootloader/src/modules/BootGRUB2EFI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB2EFI.ycp?rev=67986&r1=67985&r2=67986&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootGRUB2EFI.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB2EFI.ycp Mon Apr 23 11:50:12 2012 @@ -39,10 +39,20 @@ // for shared some routines with grub // include "bootloader/grub/misc.ycp"; // for simplified widgets than other -// include "bootloader/grub2efi/dialogs.ycp"; +include "bootloader/grub2/dialogs.ycp"; // 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 @@ -117,6 +127,11 @@ global define void Propose () { y2milestone ("Proposed globals: %1", BootCommon::globals); + if (BootCommon::globals == nil || size (BootCommon::globals) == 0) + { + BootCommon::globals = StandardGlobals(); + } + map swap_sizes = BootCommon::getSwapPartitions (); list<string> swap_parts = (list<string>) maplist (string name, integer size, swap_sizes, ``(name)); @@ -155,6 +170,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":BootGRUB2EFI::Write]) @@ -168,6 +190,7 @@ "update" : Update, #TODO grub2widgets #"widgets" : grub2Widgets, + "dialogs" : Dialogs, "widgets" : $[], "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=67986&r1=67985&r2=67986&view=diff ============================================================================== --- trunk/bootloader/src/routines/global_widgets.ycp (original) +++ trunk/bootloader/src/routines/global_widgets.ycp Mon Apr 23 11:50:12 2012 @@ -736,7 +736,7 @@ `HStretch (), `VBox ( `Label (""), - (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2-efi") + (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo") ? `Empty() : "loader_options" ), `HSpacing (2) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org