Author: juhliarik Date: Tue Apr 7 14:51:32 2009 New Revision: 56658 URL: http://svn.opensuse.org/viewcvs/yast?rev=56658&view=rev Log: - small changes in files for using grub and UI Added: trunk/bootloader/src/grub/dialogs.ycp trunk/bootloader/src/grub/options.ycp Removed: trunk/bootloader/src/routines/dialogs_i386.ycp trunk/bootloader/src/routines/grub_options.ycp trunk/bootloader/src/routines/helps_i386.ycp trunk/bootloader/src/routines/widgets_i386.ycp Modified: trunk/bootloader/src/grub/Makefile.am trunk/bootloader/src/grub/helps.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/BootLILO.ycp trunk/bootloader/src/ppc/helps.ycp trunk/bootloader/src/ppc/ppc_dialogs.ycp trunk/bootloader/src/routines/Makefile.am Modified: trunk/bootloader/src/grub/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/Makefile.am?r... ============================================================================== --- trunk/bootloader/src/grub/Makefile.am (original) +++ trunk/bootloader/src/grub/Makefile.am Tue Apr 7 14:51:32 2009 @@ -6,7 +6,9 @@ ynclude_DATA = \ helps.ycp \ - misc.ycp + misc.ycp \ + dialogs.ycp \ + options.ycp EXTRA_DIST = \ $(ynclude_DATA) Added: trunk/bootloader/src/grub/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/dialogs.ycp?r... ============================================================================== --- trunk/bootloader/src/grub/dialogs.ycp (added) +++ trunk/bootloader/src/grub/dialogs.ycp Tue Apr 7 14:51:32 2009 @@ -0,0 +1,124 @@ +/** + * File: + * include/bootloader/grub/dialogs.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Dialogs for configuraion i386-specific functions + * + * Authors: + * Jiri Srain <jsrain@suse.cz> + * + * $Id: dialogs_i386.ycp 56563 2009-04-02 08:41:25Z jreidinger $ + * + */ + + +{ +textdomain "bootloader"; + + +import "Label"; +import "Wizard"; +import "CWM"; +import "BootCommon"; +import "Stage"; + +include "bootloader/grub/options.ycp"; + + + + +/** + * Run dialog to adjust installation on i386 and AMD64 + * @return symbol for wizard sequencer + */ +symbol i386InstallDetailsDialog () { + 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 () + ]); +} + +/** + * Run dialog for loader installation details on i386 + * @return symbol for wizard sequencer + */ +symbol i386LoaderDetailsDialog () { + y2milestone ("Running i386 loader details dialog"); + + term contents = `HBox (`HSpacing (2),`VBox ( + `VStretch (), + `Frame (_("Boot Menu"), + `HBox( + `HSpacing(2), + `VBox( + `Left("activate"), + `Left("debug"), + `Left("generic_mbr"), + `Left("trusted_grub"), + `Left("hiddenmenu"), + `Left("gfxmenu"), + `Left(`HSquash("timeout")) + ), + `HStretch() + ) + ), + `VSpacing(1), + `Left("password"), + `VSpacing(1), + `Left("console"), + `VStretch () + ), + `HSpacing (2)); + + list<string> widget_names = ["activate","debug","generic_mbr", + "trusted_grub","hiddenmenu","gfxmenu","timeout", "console","password"]; + string caption = _("Boot Loader Options"); + return CWM::ShowAndRun ($[ + "widget_descr" : GrubOptions(), + "widget_names" : widget_names, + "contents" : contents, + "caption" : caption, + "back_button" : Label::BackButton (), + "abort_button" : Label::CancelButton (), + "next_button" : Label::OKButton (), + ]); +} + +/** + * Cache for genericWidgets function + */ +map<string,map<string,any> > _grub_widgets = nil; + +/** + * Get generic widgets + * @return a map describing all generic widgets + */ +global map<string,map<string,any> > grubWidgets () { + if (_grub_widgets == nil) + { + _grub_widgets = $[ + "loader_location" : grubBootLoaderLocationWidget (), + "inst_details" : grubInstalationDetials (), + ]; + } + return _grub_widgets; +} + + + +} // EOF Modified: trunk/bootloader/src/grub/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/helps.ycp?rev... ============================================================================== --- trunk/bootloader/src/grub/helps.ycp (original) +++ trunk/bootloader/src/grub/helps.ycp Tue Apr 7 14:51:32 2009 @@ -23,7 +23,7 @@ "boot-menu" : _("<p><big><b>Boot Menu</b></big><br></p>"), "activate" : - _("<b>Set active Flag in Partition Table for Boot Partition</b><br> + _("<p><b>Set active Flag in Partition Table for Boot Partition</b><br> To activate the partition which contains the boot loader. The generic MBR code will then boot the active partition. Older BIOSes require one partition to be active even if the boot loader is installed in the MBR.</p>"), @@ -63,7 +63,7 @@ "boot_custom" : _("<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"), "serial" : - _("<p><b>Serial Connection Parameters</b> lets you define the paramters to use + _("<p><b>Use Serial Console</b> lets you define the paramters to use for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"), "terminal" : _("<p><b>Terminal Definition</b></p><br> @@ -83,6 +83,16 @@ Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat it in <b>Retype Password</b>.</p>"), + "disk_order" : + // help text 1/5 + _("<p><big><b>Disks Order</b></big><br> +To specify the order of the disks according to the order in BIOS, use +the <b>Up</b> and <b>Down</b> buttons to reorder the disks. +To add a disk, push <b>Add</b>. +To remove a disk, push <b>Remove</b>.</p>"), + + + ]; Added: trunk/bootloader/src/grub/options.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/options.ycp?r... ============================================================================== --- trunk/bootloader/src/grub/options.ycp (added) +++ trunk/bootloader/src/grub/options.ycp Tue Apr 7 14:51:32 2009 @@ -0,0 +1,576 @@ +/** + * File: + * include/bootloader/routines/grub_options.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Grub widgets for bootloader options. + * + * Authors: + * Josef Reidinger<jreidinger@suse.cz> + * + * $Id: $ + * + */ + +{ +textdomain "bootloader"; + +import "Label"; +import "System::Bootloader_API"; + +include "bootloader/routines/common_options.ycp"; +include "bootloader/routines/popups.ycp"; +include "bootloader/routines/helps.ycp"; +include "bootloader/grub/helps.ycp"; + +void InitGfx(string widget){ + boolean value = BootCommon::globals["trusted_grub"]:"false" != "true"; + UI::ChangeWidget(`id(`gfxinput),`Enabled, value); + UI::ChangeWidget(`id(`gfxinput),`Value,BootCommon::globals[widget]:""); +} + +void StoreGfx(string widget, map event){ + string result = (string)UI::QueryWidget(`id(`gfxinput),`Value); + if (result == ""){ + BootCommon::global_options = remove(BootCommon::global_options, widget); + } else { + BootCommon::global_options[widget] = result; + } +} + +symbol HandleGfx(string widget, map event){ + string file = UI::AskForExistingFile("/boot", "", + _("Choose new graphical menu file")); + + if (file != nil){ + UI::ChangeWidget(`id(`gfxinput),`Value,file); + } + + return nil; +} + +map<string,any> GfxWidget(){ + return $[ + "widget" : `custom, + "custom_widget" : `HBox(`Left(`InputField(`id(`gfxinput),`opt(`hstretch), + grub_descriptions["gfxmenu"]:"gfxmenu")), + `VBox( + `Left(`Label("")), + `Left(`PushButton(`id(`browsegfx),`opt(`notify), Label::BrowseButton())) + ) + ), + "init" : InitGfx, + "store" : StoreGfx, + "handle" : HandleGfx, + "handle_events" : [`browsegfx], + "help" : grub_help_messages["gfxmenu"]:"" + ]; +} + +symbol HandleTrusted (string widget, map event){ + boolean value = (boolean)UI::QueryWidget(`id(widget),`Value); + UI::ChangeWidget(`id(`gfxinput),`Enabled,!value); + return nil; +} + +map<string,any> TrustedWidget(){ + map<string,any> widget = CommonCheckboxWidget( + grub_descriptions["trusted_grub"]:"trusted grub", + grub_help_messages["trusted_grub"]:""); + widget["opt"] = [`notify]; + widget["handle"] = HandleTrusted; + return widget; +} + +/** + * Init function of widget + * @param widget string id of the widget + */ +void InitPasswdWidget (string widget) { + string passwd = BootCommon::globals["password"]:""; + if (passwd == nil || passwd == "") + { + UI::ChangeWidget (`id (`use_pas), `Value, false); + UI::ChangeWidget (`id (`pw1), `Enabled, false); + UI::ChangeWidget (`id (`pw1), `Value, ""); + UI::ChangeWidget (`id (`pw2), `Enabled, false); + UI::ChangeWidget (`id (`pw2), `Value, ""); + } + else + { + UI::ChangeWidget (`id (`use_pas), `Value, true); + UI::ChangeWidget (`id (`pw1), `Enabled, true); + UI::ChangeWidget (`id (`pw1), `Value, "**********"); + UI::ChangeWidget (`id (`pw2), `Enabled, true); + UI::ChangeWidget (`id (`pw2), `Value, "**********"); + } + if (Mode::installation()){ + UI::ChangeWidget (`id (`use_pas), `Enable, false); + } +} + +/** + * Handle function of a widget + * @param widget string id of the widget + * @param event map event description of event that occured + * @return symbol always nil + */ +symbol HandlePasswdWidget (string widget, map event) { + if (event["ID"]:nil == `use_pas) + { + boolean enabled = (boolean)UI::QueryWidget (`id (`use_pas), `Value); + UI::ChangeWidget (`id (`pw1), `Enabled, enabled); + UI::ChangeWidget (`id (`pw2), `Enabled, enabled); + } + return nil; +} + +/** + * Store function of a popup + * @param key any widget key + * @param event map event that caused the operation + */ +void StorePasswdWidget (string key, map event) { + string password = nil; + boolean usepass = (boolean)UI::QueryWidget (`id (`use_pas), `Value); + y2milestone ("Usepass: %1", usepass); + if (usepass) + { + if (UI::QueryWidget (`id (`pw1), `Value) != "**********") + { + password = (string)UI::QueryWidget (`id (`pw1), `Value); + password = System::Bootloader_API::countGRUBPassword(password); + if (password != nil){ + BootCommon::globals["password"] = password; //TODO popup for error + } + } + } + else if (haskey (BootCommon::globals, "password")) + { + BootCommon::globals = remove (BootCommon::globals, "password"); + } + return nil; +} + + +/** + * Validate function of a popup + * @param key any widget key + * @param event map event that caused validation + * @return boolean true if widget settings ok + */ +boolean ValidatePasswdWidget (string key, map event) { + if (! (boolean)UI::QueryWidget (`id (`use_pas), `Value)) + return true; + if (UI::QueryWidget (`id (`pw1), `Value) == "") + { + emptyPasswdErrorPopup (); + UI::SetFocus (`id (`pw1)); + return false; + } + if (UI::QueryWidget (`id (`pw1), `Value) + == UI::QueryWidget (`id (`pw2), `Value) + ) + return true; + passwdMissmatchPopup (); + UI::SetFocus (`id (`pw1)); + return false; +} + + + +/** + * Build a map describing a widget + * @return a map describing a widget + */ +map<string,any> PasswordWidget () { + return $[ + "widget" : `custom, + // frame + "custom_widget" : `HBox( + `CheckBoxFrame (`id (`use_pas), + _("Prot&ect Boot Loader with Password"),true, + `HBox ( + // text entry + `Password (`id (`pw1), _("&Password")), + // text entry + `Password (`id (`pw2), _("Re&type Password")), + `HStretch() + ) + ) + ), + "init" : InitPasswdWidget, + "handle" : HandlePasswdWidget, + "store" : StorePasswdWidget, + "validate_type" : `function, + "validate_function" : ValidatePasswdWidget, + "help" : grub_help_messages["password"]:"", + ]; +} + +/** + * Init function for console + * @param string widget + */ +void InitConsole( string widget){ + boolean enable = BootCommon::globals["terminal"]:"" == "serial"; + UI::ChangeWidget(`id(`console_frame),`Value, enable); + string args = BootCommon::globals["serial"]:""; + UI::ChangeWidget(`id(`console_args),`Value, args); +} + +/** + * Store function of a console + * @param widget any widget key + * @param event map event description of event that occured + */ +void StoreConsole(string widget, map event){ + boolean use_serial = (boolean) UI::QueryWidget(`id(`console_frame),`Value); + if (use_serial) + { + BootCommon::globals["terminal"] = "serial"; + string console_value = (string) UI::QueryWidget(`id(`console_args),`Value); + if (console_value != "") + BootCommon::globals["serial"] = console_value; + } else { + if (haskey(BootCommon::globals, "terminal")) + BootCommon::globals = remove(BootCommon::globals, "terminal"); + if (haskey(BootCommon::globals, "serial")) + BootCommon::globals = remove(BootCommon::globals, "serial"); + } + // FATE: #110038: Serial console + // add or remove console key with value for sections + BootCommon::HandleConsole(); +} + +/** + * Handle function of a console + * @param widget any widget key + * @param event map event description of event that occured + * @return symbol nil + */ +symbol HandleConsole(string widget, map event){ + boolean enable = (boolean) UI::QueryWidget(`id(`enable_console),`Value); + UI::ChangeWidget(`id(`console_args),`Enabled, enable); + return nil; +} + +/** + * Common widget of a console + * @return map<string,any> CWS widget + */ +map<string,any> ConsoleWidget() { + return $[ + "widget" : `custom, + "custom_widget" : `HBox( + `CheckBoxFrame(`id(`console_frame),_("Use &serial console"),true, + `HBox( + `HSpacing(2), + `InputField(`id(`console_args),`opt(`hstretch), _("&Console arguments")), + `HStretch())) + ), + "init" : InitConsole, + "store" : StoreConsole, + "help" : grub_help_messages["serial"]:"" + ]; +} + +map<string,map<string,any> > GrubOptions(){ + map<string,map<string,any> > grub_specific = $[ + "activate" : CommonCheckboxWidget(grub_descriptions["activate"]:"activate", + grub_help_messages["activate"]:""), + "debug" : CommonCheckboxWidget(grub_descriptions["debug"]:"debug", + grub_help_messages["debug"]:""), + "generic_mbr" : CommonCheckboxWidget(grub_descriptions["generic_mbr"]:"generic mbr", + grub_help_messages["generic_mbr"]:""), + "trusted_grub" : TrustedWidget(), + "hiddenmenu" : CommonCheckboxWidget(grub_descriptions["hiddenmenu"]:"hidden menu", + grub_help_messages["hiddenmenu"]:""), + "gfxmenu" : GfxWidget(), + "password" : PasswordWidget(), + "console" : ConsoleWidget(), + ]; + return (map<string,map<string,any> >)union(grub_specific,CommonOptions()); +} + + + +void InitDiskOrder(string widget) { + list<string> disksOrder = BootCommon::DisksOrder (); + + UI::ChangeWidget ( `id(`disks), `Items, disksOrder); + UI::ChangeWidget (`id (`disks), `CurrentItem, disksOrder[0]:""); +} + +string GetItemID(term t){ + return argsof((term)argsof(t)[0]:`id(""))[0]:""; +} + +void StoreDiskOrder(string widget, map event) { + list<term> disksOrder = (list<term>)UI::QueryWidget(`id(`disks), `Items); + list<string> result = (list<string>) maplist(term t, disksOrder, { + return GetItemID(t); + }); + BootCommon::mbrDisk = result[0]:""; + integer index = 0; + BootCommon::device_mapping = listmap (string d, result, { + string indexs = tostring(index); + index = index + 1; + return $[ d : sformat ("hd%1", indexs)]; + }); +} + +string NewDevicePopup(){ + term popup = `VBox (`VSpacing (1), + // textentry header + `InputField (`id (`devname), `opt (`hstretch), _("&Device")), + `VSpacing (1), + `HBox (`HStretch (), + `PushButton (`id (`ok), `opt (`key_F10, `default), + Label::OKButton ()), + `HStretch (), + `PushButton (`id (`cancel), `opt (`key_F8), + Label::CancelButton ()), + `HStretch () + ), + `VSpacing (1) + ); + UI::OpenDialog (popup); + symbol pushed = (symbol)UI::UserInput (); + string new_dev = (string) UI::QueryWidget (`id (`devname), `Value); + UI::CloseDialog (); + string ret = ""; + if (pushed == `ok){ + ret = new_dev; + } + return ret; +} + + +symbol HandleDiskOrder( string widget, map event ){ + any action = event["ID"]:nil; + boolean changed = false; + list<term> disksOrder = (list<term>)UI::QueryWidget(`id(`disks), `Items); + string current = (string)UI::QueryWidget (`id (`disks), `CurrentItem); + integer pos = 0; + while (pos < size (disksOrder) + && GetItemID(disksOrder[pos]:`Item(`id(""))) != current) + pos = pos + 1; + + //disabling & enabling up/down + UI::ChangeWidget (`id (`up), `Enabled, pos > 0 && pos < size (disksOrder)); + UI::ChangeWidget (`id (`down), `Enabled, pos < size (disksOrder) - 1); + + if (action == `up){ + changed= true; + disksOrder = + (list<term>) BootCommon::swapItems (disksOrder, pos, pos - 1); + } else if (action == `down){ + changed= true; + disksOrder = + (list<term>) BootCommon::swapItems (disksOrder, pos, pos + 1); + } else if (action == `delete){ + changed = true; + disksOrder = remove(disksOrder,pos); + UI::ChangeWidget (`id (`disks), `CurrentItem, + (pos > 0) ? GetItemID(disksOrder[(pos-1)]:`Item(`id(""))) + : GetItemID(disksOrder[0]:`Item(`id("")))); + } else if (action == `add) { + string new_dev = NewDevicePopup(); + if (new_dev != ""){ + changed = true; + disksOrder = add(disksOrder, `item(`id(new_dev),new_dev)); + } + } + + if (changed){ + UI::ChangeWidget (`id (`disks), `Items, disksOrder); + } +} + +boolean ValidateDiskOrder(string key, map event) { + list<term> disksOrder = (list<term>)UI::QueryWidget(`id(`disks), `Items); + if (size(disksOrder)>0) + return true; + Popup::Warning(_("Device map must contain at least one device")); + return false; +} + +map<string,any> DisksOrderWidget(){ + term contents = `HBox (`HSpacing (2), `VBox ( + `VSpacing (1), + `SelectionBox (`id (`disks), + `opt (`notify, `immediate),_("D&isks"), []), + `HBox( + `HStretch (), + `PushButton (`id (`add), + `opt (`key_F3), Label::AddButton ()), + `PushButton (`id (`delete), + `opt(`key_F5), Label::DeleteButton ()), + `HStretch () + ), + `VSpacing (1) + ), + `HSquash ( + `VBox ( + `VStretch (), + `PushButton (`id (`up), + `opt (`hstretch), _("&Up")), + `PushButton (`id (`down), + `opt (`hstretch), _("&Down")), + `VStretch () + ) + ), + `HSpacing (2) + ); + return $[ + "widget" : `custom, + "custom_widget" : contents, + "init" : InitDiskOrder, + "handle" : HandleDiskOrder, + "store" : StoreDiskOrder, + "help" : grub_help_messages["disk_order"]:"", + "validate_type" : `function, + "validate_function" : ValidateDiskOrder + ]; +} + + +/** + * Init function of a widget + * @param widget string widget key + */ +void InitBootLoaderLocationWidget(string widget) { + list<string> boot_devices = BootCommon::getPartitionList(`boot); + list <string> list_global_target_keys = ["boot_mbr", "boot_boot", "boot_root", "boot_extended"]; + foreach(string key, list_global_target_keys, + { + string value = BootCommon::globals[key]:nil; + if (value != nil) + UI::ChangeWidget (`id (key), `Value, (value == "true")? true: false); + }); + UI::ChangeWidget (`id ("boot_custom_list"),`Items, boot_devices); + if ((!haskey(BootCommon::globals,"boot_custom")) && + (BootCommon::globals["boot_custom"]:"" == "")) + { + UI::ChangeWidget (`id ("boot_custom_list"),`Enabled, false); + } else { + UI::ChangeWidget (`id ("boot_custom"), `Value, true); + UI::ChangeWidget (`id ("boot_custom_list"),`Enabled, true); + UI::ChangeWidget (`id ("boot_custom_list"),`Value, BootCommon::globals["boot_custom"]:""); + } +} +/** + * handle function of a widget + * @param widget string widget key + * @param event map event that caused the operation + * @return symbol + */ +symbol HandleBootLoaderLocationWidget (string widget, map event) { + any ret = event["ID"]:nil; + if (ret == "boot_custom") + { + if ((boolean)UI::QueryWidget(`id("boot_custom"), `Value)) + UI::ChangeWidget (`id ("boot_custom_list"),`Enabled, true); + else + UI::ChangeWidget (`id ("boot_custom_list"),`Enabled, false); + } + return nil; +} + + +/** + * Store function of a widget + * @param widget string widget key + * @param event map event that caused the operation + */ +void StoreBootLoaderLocationWidget (string widget, map event) { + + list <string> list_global_target_keys = ["boot_mbr", "boot_boot", "boot_root", "boot_extended"]; + foreach(string key, list_global_target_keys, + { + string value = ((boolean)UI::QueryWidget(`id(key), `Value))?"true":"false"; + BootCommon::globals[key]= value; + }); + if ((boolean)UI::QueryWidget(`id("boot_custom"), `Value)) + BootCommon::globals["boot_custom"]= (string)UI::QueryWidget(`id("boot_custom_list"), `Value); +} + +/** FIXME: merge help text to one for BootLoaderLocationWidget + * Function merge help text from ../grub/helps.ycp + * + * @return string help text for widget BootLoaderLocationWidget + */ +string HelpBootLoaderLocationWidget() +{ + string ret = ""; + ret = grub_help_messages["boot_mbr"]:""; + ret = ret + "\n"; + ret = ret + grub_help_messages["boot_root"]:""; + ret = ret + "\n"; + ret = ret + grub_help_messages["boot_boot"]:""; + ret = ret + "\n"; + ret = ret + grub_help_messages["boot_extended"]:""; + ret = ret + "\n"; + ret = ret + grub_help_messages["boot_custom"]:""; + return ret; +} + +map<string,any> grubBootLoaderLocationWidget () +{ + term contents = `VBox ( + `Frame (_("Boot Loader Location"), + `VBox (`HBox(`HSpacing(1),`VBox( + `Left(`CheckBox( `id("boot_mbr"), _("Boot from &Master Boot Record"))), + `Left(`CheckBox( `id("boot_root"), _("Boot from &Root Partition"))), + `Left(`CheckBox( `id("boot_boot"), _("Boo&t from Boot Partition"))), + `Left(`CheckBox( `id("boot_extended"), _("Boot from &Extended Partition"))), + `Left(`CheckBox( `id("boot_custom"), `opt(`notify), _("C&ustom Boot Partition"))), + `Left(`ComboBox( `id("boot_custom_list"), `opt (`editable, `hstretch),"", [])), + `VStretch() + ))) + ), + `VStretch() + ); + + return $[ + "widget" : `custom, + "custom_widget" : contents, + "init" : InitBootLoaderLocationWidget, + "handle" : HandleBootLoaderLocationWidget, + "store" : StoreBootLoaderLocationWidget, + "help" : HelpBootLoaderLocationWidget(), + ]; +} + +/** + * Handle function of a widget + * @param widget string widget key + * @param event map event description of event that occured + * @return symbol to return to wizard sequencer, or nil + */ +symbol InstDetailsButtonHandle (string widget, map event) +{ + return `inst_details; +} + + +map<string,any> grubInstalationDetials () +{ + return $[ + "widget" : `push_button, + // push button + "label" : _("Boot Loader Installation &Details"), + "handle_events" : ["inst_details"], + "handle" : InstDetailsButtonHandle, + "help" : InstDetailsHelp (), + ]; +} + + + + +} Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.y... ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Tue Apr 7 14:51:32 2009 @@ -60,8 +60,7 @@ include "bootloader/grub/misc.ycp"; include "bootloader/routines/popups.ycp"; -include "bootloader/grub/helps.ycp"; -include "bootloader/routines/dialogs_i386.ycp"; +include "bootloader/grub/dialogs.ycp"; // end of mandatory functions Modified: trunk/bootloader/src/modules/BootLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootLILO.y... ============================================================================== --- trunk/bootloader/src/modules/BootLILO.ycp (original) +++ trunk/bootloader/src/modules/BootLILO.ycp Tue Apr 7 14:51:32 2009 @@ -29,11 +29,10 @@ import "Mode"; import "Pkg"; import "Storage"; +import "Stage"; include "bootloader/routines/popups.ycp"; -include "bootloader/routines/dialogs_i386.ycp"; - /** * remove blanks from section name and replace them with _ @@ -295,10 +294,7 @@ } global map<string,symbol()> Dialogs () { - return $[ - "installation" : i386InstallDetailsDialog, - "loader" : i386LoaderDetailsDialog, - ]; + return $[]; } /** Modified: trunk/bootloader/src/ppc/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/ppc/helps.ycp?rev=... ============================================================================== --- trunk/bootloader/src/ppc/helps.ycp (original) +++ trunk/bootloader/src/ppc/helps.ycp Tue Apr 7 14:51:32 2009 @@ -30,17 +30,17 @@ Only for Pmac. Folder that contains your boot stuff, this folder will be blessed to mark it bootable.</p>"), "append" : - _("<p><b>Append string for.global options to pass to kernel command line</b><br> + _("<p><b>Append String for Global Options to Pass to Kernel Command Line</b><br> Lets you define additional global parameters to pass to the kernel. These are used if no 'append' appears in a given section.</p> "), "initrd" : - _("<p><b>Name of the default initrd file</b>, if not empty, defines the initial + _("<p><b>Name of the Default Initrd File</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name directly or choose by using <b>Browse</b></p> "), "image" : - _("<p><b>Name of default image file</b>, if not empty, defines the image + _("<p><b>Name of Default Image File</b>, if not empty, defines the image file to use. Either enter the path and file name directly or choose by using <b>Browse</b></p>"), "root" : Modified: trunk/bootloader/src/ppc/ppc_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/ppc/ppc_dialogs.yc... ============================================================================== --- trunk/bootloader/src/ppc/ppc_dialogs.ycp (original) +++ trunk/bootloader/src/ppc/ppc_dialogs.ycp Tue Apr 7 14:51:32 2009 @@ -34,7 +34,7 @@ void PPCArchDep() { string board_type = getBoardType (); - + board_type = "prep"; switch(board_type) { case ("prep"): arch_term = `Frame ( _("PReP Specific Settings"),`HBox(`HSpacing(1),`VBox( @@ -110,7 +110,7 @@ { string board_type = getBoardType (); - +board_type = "prep"; switch(board_type) { case ("prep"): return BootPReP(); Modified: trunk/bootloader/src/routines/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/Makefile.... ============================================================================== --- trunk/bootloader/src/routines/Makefile.am (original) +++ trunk/bootloader/src/routines/Makefile.am Tue Apr 7 14:51:32 2009 @@ -17,11 +17,7 @@ lib_iface.ycp \ wizards.ycp \ dialogs.ycp \ - dialogs_i386.ycp \ - widgets_i386.ycp \ - helps_i386.ycp \ autoinstall.ycp \ - grub_options.ycp \ common_options.ycp \ common_helps.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org