Hello community, here is the log from the commit of package yast2-bootloader checked in at Wed Oct 22 10:18:42 CEST 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-10-21 12:44:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-10-22 10:17:48.186286000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 21 18:35:31 CEST 2008 - juhliarik@suse.cz + +- update for bug with deleting boot section (bnc #436890) +- 2.17.31 + +------------------------------------------------------------------- @@ -5 +11 @@ - (bnc #436899) + (bnc #436890) calling whatdependson for head-i586 Old: ---- yast2-bootloader-2.17.30.tar.bz2 New: ---- yast2-bootloader-2.17.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.n27702/_old 2008-10-22 10:18:01.000000000 +0200 +++ /var/tmp/diff_new_pack.n27702/_new 2008-10-22 10:18:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.17.30) +# spec file for package yast2-bootloader (Version 2.17.31) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-bootloader -Version: 2.17.30 +Version: 2.17.31 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.17.30.tar.bz2 +Source0: yast2-bootloader-2.17.31.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -64,7 +64,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.17.30 +%setup -n yast2-bootloader-2.17.31 %build %{prefix}/bin/y2tool y2autoconf @@ -112,8 +112,11 @@ %changelog * Tue Oct 21 2008 juhliarik@suse.cz +- update for bug with deleting boot section (bnc #436890) +- 2.17.31 +* Tue Oct 21 2008 juhliarik@suse.cz - added fix for problem with deleting all boot section for elilo - (bnc #436899) + (bnc #436890) - added fox for problem with XEN boot section in domU (bnc #436899) - 2.17.30 * Fri Oct 17 2008 juhliarik@suse.cz ++++++ yast2-bootloader-2.17.30.tar.bz2 -> yast2-bootloader-2.17.31.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.30/src/modules/Bootloader.ycp new/yast2-bootloader-2.17.31/src/modules/Bootloader.ycp --- old/yast2-bootloader-2.17.30/src/modules/Bootloader.ycp 2008-10-21 12:08:53.000000000 +0200 +++ new/yast2-bootloader-2.17.31/src/modules/Bootloader.ycp 2008-10-21 19:25:52.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: Bootloader.ycp 52385 2008-10-21 10:08:52Z juhliarik $ + * $Id: Bootloader.ycp 52408 2008-10-21 17:25:51Z juhliarik $ * */ @@ -733,6 +733,49 @@ return ret; } +boolean FindAndSelectDefault(map<string,any> default_sec) +{ + boolean ret = false; + boolean set_candidate = false; + string default_name = BootCommon::globals["default"]:""; + string default_candidate = ""; + + foreach(map<string,any> section, BootCommon::sections, + { + if (section["name"]:nil == default_name) + { + y2milestone("Default section was found."); + ret = true; + break; + } else { + if ((section["root"]:"" == default_sec["root"]:"") + && (section["type"]:"" == "image") + && (section["original_name"]:"" == "linux")) + { + default_candidate = section["name"]:""; + y2milestone("Candidate for default section is: %1", section); + set_candidate = true; + break; + } + + } + }); + if (!ret) + { + if ((set_candidate) && (default_candidate!="")) + { + y2milestone("Default section will be update to: %1", default_candidate); + BootCommon::globals["default"] = default_candidate; + ret = true; + } else { + y2error("Default section was not found"); + } + + } + return ret; + +} + /** * Find "same" boot sections and return numbers of sections @@ -823,6 +866,7 @@ return true; }); ResolveSymlinksInSections(); + FindAndSelectDefault(linux_default); y2milestone("Boot sections AFTER deleting: %1", BootCommon::sections); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.30/src/routines/lilolike.ycp new/yast2-bootloader-2.17.31/src/routines/lilolike.ycp --- old/yast2-bootloader-2.17.30/src/routines/lilolike.ycp 2008-10-21 12:08:53.000000000 +0200 +++ new/yast2-bootloader-2.17.31/src/routines/lilolike.ycp 2008-10-21 19:25:52.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain@suse.cz> * Olaf Dabrunz <od@suse.de> * - * $Id: lilolike.ycp 52385 2008-10-21 10:08:52Z juhliarik $ + * $Id: lilolike.ycp 52408 2008-10-21 17:25:51Z juhliarik $ * */ { @@ -1486,6 +1486,8 @@ sec = remove(sec, "xen"); if (haskey(sec,"xen_append")) sec = remove(sec, "xen_append"); + if (haskey(sec,"lines_cache_id")) + sec = remove(sec, "lines_cache_id"); y2milestone("Converted XEN section in domU: %1", sec); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.30/VERSION new/yast2-bootloader-2.17.31/VERSION --- old/yast2-bootloader-2.17.30/VERSION 2008-10-21 12:03:47.000000000 +0200 +++ new/yast2-bootloader-2.17.31/VERSION 2008-10-21 18:34:53.000000000 +0200 @@ -1 +1 @@ -2.17.30 +2.17.31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de