[yast-commit] r61352 - in /trunk/bootloader: package/yast2-bootloader.changes src/modules/BootELILO.ycp

Author: juhliarik Date: Tue Mar 16 17:33:37 2010 New Revision: 61352 URL: http://svn.opensuse.org/viewcvs/yast?rev=61352&view=rev Log: added fix for adding XEN section on IA64 bnc#588609 Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootELILO.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=61352&r1=61351&r2=61352&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Mar 16 17:33:37 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 16 17:35:52 CET 2010 - juhliarik@suse.cz + +- added fix for adding XEN section on IA64 (bnc#588609) + +------------------------------------------------------------------- Tue Mar 9 16:17:10 CET 2010 - juhliarik@suse.cz - added fix for using device map in autoyast profile (bnc#585824) Modified: trunk/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO.ycp?rev=61352&r1=61351&r2=61352&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootELILO.ycp (original) +++ trunk/bootloader/src/modules/BootELILO.ycp Tue Mar 16 17:33:37 2010 @@ -160,14 +160,20 @@ global void CreateSections () { map linux = CreateLinuxSection ("linux"); map failsafe = CreateLinuxSection ("failsafe"); - map xen = CreateLinuxSection ("xen"); + + // bnc#588609 - Problems writing elilo + map xen = $[]; + if (BootCommon::XenPresent ()) + xen = CreateLinuxSection ("xen"); // append for default section is in global // FIXME do it later // if (haskey (linux, "append")) // linux = remove (linux, "append"); - - BootCommon::sections = [ linux, failsafe, xen ]; + if ((xen != nil) && (size(xen) >0)) + BootCommon::sections = [ linux, failsafe, xen ]; + else + BootCommon::sections = [ linux, failsafe ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org