Author: juhliarik Date: Tue Dec 2 16:37:48 2008 New Revision: 53825 URL: http://svn.opensuse.org/viewcvs/yast?rev=53825&view=rev Log: added fix for problem with starting second stage if windows is default boot section Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/clients/bootloader_finish.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=53825&r1=53824&r2=53825&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Dec 2 16:37:48 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 2 16:28:27 CET 2008 - juhliarik@suse.cz + +- added fix for onetime boot if default is windows (bnc #339024) + +------------------------------------------------------------------- Tue Dec 2 15:35:30 CET 2008 - juhliarik@suse.cz - updated heuristic for adding other OS to menu.lst for GRUB Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader_finish.ycp?rev=53825&r1=53824&r2=53825&view=diff ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Tue Dec 2 16:37:48 2008 @@ -202,8 +202,25 @@ } // (bnc #381192) don't use it if kexec is used + // update calling onetime boot bnc #339024 if (!retcode) - return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); + { + string bl = Bootloader::getLoaderType(); + if (bl == "grub") + { + if (BootCommon::isDefaultBootSectioLinux(Bootloader::getDefaultSection ())) + { + return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); + } else { + return Bootloader::FlagOnetimeBoot(BootCommon::findRelativeDefaultLinux ()); + } + + } else { + + return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); + + } + } } else return retcode; Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=53825&r1=53824&r2=53825&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Tue Dec 2 16:37:48 2008 @@ -369,6 +369,8 @@ global define boolean UsingXenPae(); global map CreateLinuxSection (string title); global string UpdateSerialConsole (string append, string console); + + // // FIXME: the select and selectdevice seem to be broken: the default value of // the widget description string needs to be patched with the current value of Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=53825&r1=53824&r2=53825&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Tue Dec 2 16:37:48 2008 @@ -2089,7 +2089,7 @@ * @return string name of default boot section */ -string findRelativeDefaultLinux () +global string findRelativeDefaultLinux () { string default_linux = ""; @@ -2118,7 +2118,7 @@ * @param string default boot name * @return boolean true if boot name is linux */ -boolean isDefaultBootSectioLinux(string default_boot) +global boolean isDefaultBootSectioLinux(string default_boot) { boolean ret = false; foreach(maps, BootCommon::sections, @@ -2515,7 +2515,7 @@ { sections[idx, "console"] = console_value; sections[idx, "__changed"] = true; - if (sections[idx, "append"]:"" != "") + if (sections[idx, "append"]:nil != nil) { string updated_append = BootCommon::UpdateSerialConsole(sections[idx,"append"]:"", -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org