Author: juhliarik Date: Wed May 7 17:19:39 2008 New Revision: 47359 URL: http://svn.opensuse.org/viewcvs/yast?rev=47359&view=rev Log: - fix for bnc# 335526 problem with adding resume for boot section memtest M bootloader/VERSION * new version M bootloader/src/routines/lilolike.ycp * checking "original_name" for adding "resume" M bootloader/package/yast2-bootloader.changes * description changes Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=47359&... ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Wed May 7 17:19:39 2008 @@ -1 +1 @@ -2.16.14 +2.16.15 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootload... ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Wed May 7 17:19:39 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 7 14:54:16 CEST 2008 - juhliarik@suse.cz + +- added fix for bnc# 335526 - problem with adding "resume" into + boot section for memtest +- 2.16.15 + +------------------------------------------------------------------- Mon Apr 28 14:16:26 CEST 2008 - juhliarik@suse.cz - added fix for bnc# 232424 - problem with propose new config. Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.... ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Wed May 7 17:19:39 2008 @@ -626,9 +626,12 @@ && ! haskey (getSwapPartitions (), resume)) // points to unexistent swap partition { - append = setKernelParamToLine (append, - "resume", getLargestSwapPartition ()); - s["append"] = append; + // bnc# 335526 - Installing memtest with lilo screws up installation + if (search(s["original_name"]:"", "memtest") == nil) + { + append = setKernelParamToLine (append, "resume", getLargestSwapPartition ()); + s["append"] = append; + } } return s; }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org