Author: juhliarik Date: Tue Oct 21 12:08:52 2008 New Revision: 52385 URL: http://svn.opensuse.org/viewcvs/yast?rev=52385&view=rev Log: - added fix for wrong menu.lst in domU (bnc #436899) - added fix for problem with deleting all boot section in elilo (bnc #436890) Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootCommon.ycp 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=52385&r1=52384&r2=52385&view=diff ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Tue Oct 21 12:08:52 2008 @@ -1 +1 @@ -2.17.29 +2.17.30 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=52385&r1=52384&r2=52385&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Oct 21 12:08:52 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Oct 21 12:01:31 CEST 2008 - juhliarik@suse.cz + +- added fix for problem with deleting all boot section for elilo + (bnc #436899) +- added fox for problem with XEN boot section in domU (bnc #436899) +- 2.17.30 + +------------------------------------------------------------------- Fri Oct 17 14:58:02 CEST 2008 - juhliarik@suse.cz - added fix for adding language to GRUB (bnc #429287) Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=52385&r1=52384&r2=52385&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Tue Oct 21 12:08:52 2008 @@ -874,6 +874,10 @@ if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) globals = remove(globals, "gfxmenu"); + // convert XEN section to linux section id running in domU + // bnc #436899 + ConvertXENinDomU (); + ret = ret && SetDeviceMap (my_device_mapping); ret = ret && SetSections (sections); ret = ret && SetGlobal (my_globals); Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloader.ycp?rev=52385&r1=52384&r2=52385&view=diff ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Tue Oct 21 12:08:52 2008 @@ -801,7 +801,16 @@ if ((section["root"]:nil == linux_default["root"]:nil) ||(section["root"]:nil == linux_failsafe["root"]:nil) ||(section["root"]:nil == linux_xen["root"]:nil)) - { + { + if (section["original_name"]:"" == "failsafe") + num_linux_failsafe = num_linux_failsafe -1; + + if (section["original_name"]:"" == "linux") + num_linux_default = num_linux_default -1; + + if (section["original_name"]:"" == "xen") + num_linux_xen = num_linux_xen -1; + y2milestone("deleted boot section: %1", section); return false; } else { @@ -813,6 +822,7 @@ }; return true; }); + ResolveSymlinksInSections(); 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=52385&r1=52384&r2=52385&view=diff ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Tue Oct 21 12:08:52 2008 @@ -1451,6 +1451,55 @@ return ret; } +/** + * Convert XEN boot section to normal linux section + * if intalling in domU (bnc #436899) + * + * @return boolean true if XEN section is converted to linux section + */ + +boolean ConvertXENinDomU () +{ + + boolean ret = false; + if (!Arch::is_xenU()) + { + y2milestone("Don't convert XEN section - it is not running in domU"); + return ret; + } + + // tmp sections + list<map<string,any> > tmp_sections = []; + + foreach(map<string,any> sec, BootCommon::sections, + { + if (sec["type"]:"" != "xen") + { + tmp_sections = add(tmp_sections, sec); + + } else { + // convert XEN section to linux section + y2milestone("Converting XEN section in domU: %1", sec); + sec["type"] = "image"; + sec["original_name"] = "linux"; + if (haskey(sec,"xen")) + sec = remove(sec, "xen"); + if (haskey(sec,"xen_append")) + sec = remove(sec, "xen_append"); + + y2milestone("Converted XEN section in domU: %1", sec); + + tmp_sections = add(tmp_sections, sec); + + ret = true; + } + }); + + BootCommon::sections = tmp_sections; + return ret; +} + + } // EOF -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org