[yast-commit] r47238 - in /branches/SuSE-SLE-10-SP2-Branch/bootloader: VERSION package/yast2-bootloader.changes src/routines/lilolike.ycp

Author: juhliarik Date: Wed Apr 30 16:36:21 2008 New Revision: 47238 URL: http://svn.opensuse.org/viewcvs/yast?rev=47238&view=rev Log: - added fix for deleting old boot sections (bnc# 367356) - new version 2.13.155 M bootloader/VERSION * new version 2.13.155 M bootloader/src/routines/lilolike.ycp * added fix in function RemoveUnexistentSections() M bootloader/package/yast2-bootloader.changes * description of changes Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION?rev=47238&r1=47237&r2=47238&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION Wed Apr 30 16:36:21 2008 @@ -1 +1 @@ -2.13.154 +2.13.155 Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes?rev=47238&r1=47237&r2=47238&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes Wed Apr 30 16:36:21 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 30 16:34:19 CEST 2008 - juhliarik@suse.cz + +- added fix for deleting old boot sections (bnc# 367356) +- 2.13.155 + +------------------------------------------------------------------- Tue Mar 18 17:40:42 CET 2008 - juhliarik@suse.cz - deleting ordering of disk if the first disk is USB Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp?rev=47238&r1=47237&r2=47238&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp Wed Apr 30 16:36:21 2008 @@ -823,6 +823,9 @@ { string defaultv = globals["default"]:""; string first = nil; + + y2milestone("Starting RemoveUnexistentSections() with sections: %1", BootCommon::sections); + BootCommon::sections = filter (map s, BootCommon::sections, { string label = s["name"]:""; @@ -831,6 +834,7 @@ { if (first == nil) first = label; + y2milestone("Section is not deleted, section: %1", s); return true; } @@ -840,13 +844,27 @@ y2warning ("Removing section with empty title"); if (label == defaultv) defaultv = nil; + y2milestone("Deleted (empty label) section: %1", s); return false; } + // bug #367356 After an upgrade install grub default menu selection is still the SP1 kernel + // problem is that section map doesn't include "original_name" + + if ((type =="") && (s["type"]:"" == "image")) + { + y2milestone("Missing key \"original_name\" in section map for section: %1", s); + + // checking root value + if (s["root"]:"" == RootPartitionDevice) + type="linux"; + + } // FIXME the following check makes sense for all sections` if (! contains (["linux", "failsafe", "memtest86", "xen"], type)) { if (first == nil) first = label; + y2milestone("Section is not deleted (type of section), section: %1", s); return true; } string kernel =""; @@ -859,6 +877,7 @@ { if (first == nil) first = label; + y2milestone("Section is not deleted (empty kernel/image), section: %1", s); return true; } if (substring (kernel, 0, 1) == "/") @@ -868,7 +887,10 @@ else { if (relative_path_prefix == "") + { + y2milestone("Section is not deleted (relative_path_prefix == \"\"), section: %1", s); return true; + } kernel = relative_path_prefix + kernel; } if (SCR::Read (.target.size, kernel) == -1) @@ -877,10 +899,13 @@ label, kernel); if (label == defaultv) defaultv = nil; + + y2milestone("Deleted (kernel does't exist) section: %1", s); return false; } if (first == nil) first = label; + y2milestone("Section is not deleted (it seems be OK), section: %1", s); return true; }); if (defaultv == nil) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org