Author: juhliarik Date: Tue Oct 21 19:25:51 2008 New Revision: 52408 URL: http://svn.opensuse.org/viewcvs/yast?rev=52408&view=rev Log: update of fix for problem with elilo bnc #436890 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=52408&r1=52407&r2=52408&view=diff ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Tue Oct 21 19:25:51 2008 @@ -1 +1 @@ -2.17.30 +2.17.31 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=52408&r1=52407&r2=52408&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Oct 21 19:25:51 2008 @@ -1,8 +1,14 @@ ------------------------------------------------------------------- +Tue Oct 21 18:35:31 CEST 2008 - juhliarik@suse.cz + +- update for bug with deleting boot section (bnc #436890) +- 2.17.31 + +------------------------------------------------------------------- Tue Oct 21 12:01:31 CEST 2008 - juhliarik@suse.cz - added fix for problem with deleting all boot section for elilo - (bnc #436899) + (bnc #436890) - added fox for problem with XEN boot section in domU (bnc #436899) - 2.17.30 Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloader.ycp?rev=52408&r1=52407&r2=52408&view=diff ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Tue Oct 21 19:25:51 2008 @@ -733,6 +733,49 @@ return ret; } +boolean FindAndSelectDefault(map default_sec) +{ + boolean ret = false; + boolean set_candidate = false; + string default_name = BootCommon::globals["default"]:""; + string default_candidate = ""; + + foreach(map section, BootCommon::sections, + { + if (section["name"]:nil == default_name) + { + y2milestone("Default section was found."); + ret = true; + break; + } else { + if ((section["root"]:"" == default_sec["root"]:"") + && (section["type"]:"" == "image") + && (section["original_name"]:"" == "linux")) + { + default_candidate = section["name"]:""; + y2milestone("Candidate for default section is: %1", section); + set_candidate = true; + break; + } + + } + }); + if (!ret) + { + if ((set_candidate) && (default_candidate!="")) + { + y2milestone("Default section will be update to: %1", default_candidate); + BootCommon::globals["default"] = default_candidate; + ret = true; + } else { + y2error("Default section was not found"); + } + + } + return ret; + +} + /** * Find "same" boot sections and return numbers of sections @@ -823,6 +866,7 @@ return true; }); ResolveSymlinksInSections(); + FindAndSelectDefault(linux_default); y2milestone("Boot sections AFTER deleting: %1", BootCommon::sections); } Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.ycp?rev=52408&r1=52407&r2=52408&view=diff ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Tue Oct 21 19:25:51 2008 @@ -1486,6 +1486,8 @@ sec = remove(sec, "xen"); if (haskey(sec,"xen_append")) sec = remove(sec, "xen_append"); + if (haskey(sec,"lines_cache_id")) + sec = remove(sec, "lines_cache_id"); y2milestone("Converted XEN section in domU: %1", sec); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org