Author: juhliarik Date: Fri Dec 4 16:16:44 2009 New Revision: 59966 URL: http://svn.opensuse.org/viewcvs/yast?rev=59966&view=rev Log: added fix for section names in lilo.conf for PPC Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootPOWERLILO.ycp trunk/bootloader/src/modules/Bootloader.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=59966&r1=59965&r2=59966&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Dec 4 16:16:44 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 4 16:14:07 CET 2009 - juhliarik@suse.cz + +- added fix for section name mismatch in lilo.conf for PPC + (bnc#441051) + +------------------------------------------------------------------- Tue Oct 13 15:41:07 CEST 2009 - juhliarik@suse.cz - deleted handling of luks_root and updating initrd for encrypted Modified: trunk/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootPOWERLILO.ycp?rev=59966&r1=59965&r2=59966&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ trunk/bootloader/src/modules/BootPOWERLILO.ycp Fri Dec 4 16:16:44 2009 @@ -414,7 +414,7 @@ * @param title string the section name to create (untranslated) * @return map describes the section */ -map<string,any> CreateImageSection (string title) { +global map<string,any> CreateImageSection (string title) { map<string,any> ret = BootCommon::CreateLinuxSection(title); //Do not use translated names, as we are happy if it work with kernel device ret["root"] = BootStorage::RootPartitionDevice; Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloader.ycp?rev=59966&r1=59965&r2=59966&view=diff ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Fri Dec 4 16:16:44 2009 @@ -39,7 +39,6 @@ import "BootPOWERLILO"; // The ppc-LILO File //fate 303395 import "ProductFeatures"; - import "Arch"; // interface for clients global define map Export (); @@ -842,9 +841,18 @@ return; } y2milestone("Deleting duplicated boot sections"); - map<string,any> linux_default = BootCommon::CreateLinuxSection ("linux"); - map<string,any> linux_failsafe = BootCommon::CreateLinuxSection ("failsafe"); - map<string,any> linux_xen = BootCommon::CreateLinuxSection ("xen"); + + map<string,any> linux_default = $[]; + map<string,any> linux_failsafe = $[]; + map<string,any> linux_xen = $[]; + if (Arch::ppc()) + { + linux_default = BootPOWERLILO::CreateImageSection("linux"); + } else { + linux_default = BootCommon::CreateLinuxSection ("linux"); + linux_failsafe = BootCommon::CreateLinuxSection ("failsafe"); + linux_xen = BootCommon::CreateLinuxSection ("xen"); + } y2milestone("Proposed section for linux_default: %1", linux_default); y2milestone("Proposed section for linux_failsafe: %1", linux_failsafe); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org