Author: juhliarik Date: Wed Dec 2 17:04:21 2009 New Revision: 59912 URL: http://svn.opensuse.org/viewcvs/yast?rev=59912&view=rev Log: added fix for better checking of duplicated boot sections in PPC (bnc#448093) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootPOWERLILO.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION?rev=59912&r1=59911&r2=59912&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Wed Dec 2 17:04:21 2009 @@ -1 +1 @@ -2.17.63 +2.17.64 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes?rev=59912&r1=59911&r2=59912&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Wed Dec 2 17:04:21 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 2 17:02:29 CET 2009 - juhliarik@suse.cz + +- added better checking of duplicated boot section for PPC + (bnc#448093) +- 2.17.64 + +------------------------------------------------------------------- Wed Dec 2 14:56:42 CET 2009 - juhliarik@suse.cz - added fix for update of bootloader seetings (bnc#474039) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootPOWERLILO.ycp?rev=59912&r1=59911&r2=59912&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootPOWERLILO.ycp Wed Dec 2 17:04:21 2009 @@ -412,7 +412,7 @@ * @param title string the section name to create (untranslated) * @return map describes the section */ -map CreateImageSection (string title) { +global map CreateImageSection (string title) { // FIXME: This really should be a function and not be duplicated in // BootCommon.ycp (although that code there also handles wildcard Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp?rev=59912&r1=59911&r2=59912&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp Wed Dec 2 17:04:21 2009 @@ -41,7 +41,6 @@ import "BootPOWERLILO"; // The ppc-LILO File //fate 303395 import "ProductFeatures"; - import "Arch"; // interface for clients global define map Export (); @@ -862,9 +861,17 @@ return; } y2milestone("Deleting duplicated boot sections"); - map linux_default = BootCommon::CreateLinuxSection ("linux"); - map linux_failsafe = BootCommon::CreateLinuxSection ("failsafe"); - map linux_xen = BootCommon::CreateLinuxSection ("xen"); + map linux_default = $[]; + map linux_failsafe = $[]; + map 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