Author: juhliarik Date: Thu Apr 2 09:12:08 2009 New Revision: 56554 URL: http://svn.opensuse.org/viewcvs/yast?rev=56554&view=rev Log: updated bootloader UI for PPC Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/Bootloader.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp?rev=56554&r1=56553&r2=56554&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/grub/helps.ycp Thu Apr 2 09:12:08 2009 @@ -79,7 +79,7 @@ "gfxmenu" : _("<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"), "password" : - _("<p><b>Password for the Menu Interface</b><br> + _("<p><b>Protect Boot Loader with Password</b><br> 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>"), "type_image" : Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/Bootloader.ycp?rev=56554&r1=56553&r2=56554&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/Bootloader.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/Bootloader.ycp Thu Apr 2 09:12:08 2009 @@ -622,11 +622,11 @@ y2milestone ("Writing bootloader configuration during installation"); boolean ret = true; - // read current settings... - ret = blRead (true, false); - if (! Mode::live_installation()) { + // bnc#449785 - Installing of GRUB fails when using live installer from a USB stick + // read current settings... + ret = blRead (true, false); // delete duplicated sections DelDuplicatedSections(); } else { Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp?rev=56554&r1=56553&r2=56554&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp Thu Apr 2 09:12:08 2009 @@ -47,6 +47,25 @@ _("<p><b>Set Default Root Filesystem</b> Set global root filesystem for Linux</p>"), + "clone" : + _("<p><b>Partition for Boot Loader Duplication</b> +specifies other Linux device nodes where the bootinfo should be stored. +If this option is given, the boot partition will be converted to FAT. +The intend of this option is to write the boot files to all members of a RAID1 or RAID5 system.</p>"), + + "activate" : + _("<p><b>Change Boot Device in NV-RAM</b> +this option will tell lilo to update the OpenFirmware \"boot-device\" +variable with the full OpenFirmware path pointing to the device specified in +\"boot=\". If this option is missing, the system may not boot.</p>"), + + "no_os_chooser" : + _("<p><b>Do not Use OS-chooser</b> + will tell lilo to use yaboot as boot file instead of a Forth script named \"os-chooser\". +The OpenFirmware driver in the nVidia graphics card as shipped with Apple G5 systems +will crash if there is no monitor attached.</p>"), + + ]; Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp?rev=56554&r1=56553&r2=56554&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp Thu Apr 2 09:12:08 2009 @@ -121,7 +121,7 @@ break; case ("iseries"): - return $[]; + return BootISeries(); break; default: Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp?rev=56554&r1=56553&r2=56554&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp Thu Apr 2 09:12:08 2009 @@ -32,13 +32,6 @@ */ -// add widget "boot_chrp_custom" CHRP -/* - $go->{boot_chrp_custom} = "select:PReP or FAT partition::" .$boot_partitions; - -*/ - - void InitDuplicatePartition(string widget) { list <string> devices = prep_boot_partitions; if (size(devices) != 0) @@ -232,38 +225,7 @@ ]; } - - /* -void InitBootPMac(string widget) { - list <string> devices = pmac_boot_partitions; - if (device != "") - { - UI::ChangeWidget (`id (widget), `Items, [device]); - } - UI::ChangeWidget (`id (widget), `Value, - ([device]([BootCommon::globals[widget]:""]))[0]:""); -} - -void StoreBootPMac (string widget, map event) { -BootCommon::globals[widget] - = (splitstring( (string)UI::QueryWidget (`id (widget), `Value), " "))[0]:""; -} - -map BootPMac(){ - return $[ - "widget" : `combobox, - "label" : _("HF&S boot partition"), - "items" : [], - "opt" : [`editable], - "help" : ppc_help_messages["boot_pmac_custom"]:"", - "init" : InitBootPMac, - "store" : StoreBootPMac, - ]; -} -*/ - - void BootInit(string widget){ UI::ChangeWidget(`id(widget+"_enabled"),`Value, haskey(BootCommon::globals,widget)); UI::ChangeWidget(`id(widget), `Enabled, haskey(BootCommon::globals,widget)); @@ -302,6 +264,101 @@ "store" : BootStore ]; } +*/ +void InitBootISeries(string widget) { + list <string> devices = prep_boot_partitions; + if (size(devices) != 0) + { + UI::ChangeWidget (`id ("boot_iseries_custom"), `Items, devices); + } + + if (BootCommon::globals["boot_iseries_custom"]:"" == "") + { + UI::ChangeWidget (`id ("enable_iseries"), `Value, false); + UI::ChangeWidget (`id ("boot_iseries_custom"), `Enabled, false); + } else { + UI::ChangeWidget (`id ("enable_iseries"), `Value, true); + UI::ChangeWidget (`id ("boot_iseries_custom"), `Enabled, true); + UI::ChangeWidget (`id ("boot_iseries_custom"), `Value, BootCommon::globals["boot_iseries_custom"]:""); + } + + if (BootCommon::globals["boot_slot"]:"" != "") + UI::ChangeWidget (`id ("boot_slot"), `Value, BootCommon::globals["boot_slot"]:""); + + if (BootCommon::globals["boot_file"]:"" != "") + UI::ChangeWidget (`id ("boot_file"), `Value, BootCommon::globals["boot_file"]:""); + +} + +symbol HandleBootISeries (string key, map event) { + any ret = event["ID"]:nil; + if (ret == "enable_iseries") { + UI::ChangeWidget (`id ("boot_iseries_custom"), `Enabled, + (boolean) UI::QueryWidget(`id("enable_iseries"), `Value)); + } + + if (ret == "boot_file_browse") { + string current = (string)UI::QueryWidget (`id ("boot_file"), `Value); + // file open popup caption + current = UI::AskForExistingFile (current, "*", _("Select File")); + if (current != nil) + UI::ChangeWidget (`id ("boot_file"), `Value, current); + + } + return nil; +} + + + + + +void StoreBootISeries (string widget, map event) { + if ((boolean) UI::QueryWidget(`id("enable_iseries"), `Value)) + { + BootCommon::globals["boot_iseries_custom"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_iseries_custom"), `Value), " "))[0]:""; + } else { + BootCommon::globals["boot_iseries_custom"] = ""; + } + BootCommon::globals["boot_slot"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_slot"), `Value), " "))[0]:""; + + BootCommon::globals["boot_file"] = (string)UI::QueryWidget (`id ("boot_file"), `Value); +} + + + + + + +map BootISeries(){ + return $[ + "widget" : `custom, + "custom_widget" : `VBox( + `Frame ( _("Boot Loader Location"), `VBox( + `Left(`HBox(`HSpacing(1),`VBox( + `Left(`CheckBox(`id("enable_iseries"), `opt(`notify), _("&PReP Partition"))), + `Left(`ComboBox(`id("boot_iseries_custom"), `opt(`editable, `hstretch), "", [""])), + `Left(`HBox( + `Left(`InputField(`id("boot_file"),`opt(`hstretch), _("Create Boot &Image in File"))), + `VBox( + `Label(""), + `PushButton(`id("boot_file_browse"),`opt(`notify), Label::BrowseButton()) + ) + )), + `Left(`ComboBox(`id("boot_slot"), _("&Write to Boot Slot"), ["", "A","B","C","D"])) + ))) + ))), + "help" : ppc_help_messages["boot_iseries_custom"]:"", + "init" : InitBootISeries, + "handle" : HandleBootISeries, + "store" : StoreBootISeries, + ]; +} + + + + /** * Get the globals dialog tabs description * @return a map the description of the tabs @@ -350,7 +407,7 @@ // end PREP // PMAC - "no_os_chooser" : CommonCheckboxWidget(_("Do not use OS-chooser"), ppc_help_messages["no_os_chooser"]:""), + "no_os_chooser" : CommonCheckboxWidget(_("Do not Use OS-chooser"), ppc_help_messages["no_os_chooser"]:""), "macos_timeout" : CommonIntFieldWidget (_("Timeout in Seconds for MacOS/Linux"), ppc_help_messages["macos_timeout"]:"",0,60), Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp?rev=56554&r1=56553&r2=56554&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp Thu Apr 2 09:12:08 2009 @@ -72,7 +72,6 @@ `Left("debug"), `Left("generic_mbr"), `Left("trusted_grub"), - `Left("password"), `Left("hiddenmenu"), `Left("gfxmenu"), `Left(`HSquash("timeout")) @@ -80,6 +79,9 @@ `HStretch() ) ), + `VSpacing(1), + `Left("password"), + `VSpacing(1), `Left("console"), `VStretch () ), Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp?rev=56554&r1=56553&r2=56554&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp Thu Apr 2 09:12:08 2009 @@ -188,22 +188,24 @@ return $[ "widget" : `custom, // frame - "custom_widget" : + "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")) + `Password (`id (`pw2), _("Re&type Password")), + `HStretch() ) + ) ), "init" : InitPasswdWidget, "handle" : HandlePasswdWidget, "store" : StorePasswdWidget, "validate_type" : `function, "validate_function" : ValidatePasswdWidget, - "help" : ""//i386PasswdHelp (), + "help" : grub_help_messages["password"]:"", ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org