Hello community, here is the log from the commit of package yast2-bootloader checked in at Wed May 10 20:54:12 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-05-10 15:52:09.000000000 +0200 +++ STABLE/yast2-bootloader/yast2-bootloader.changes 2006-05-10 19:08:52.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 10 19:07:38 CEST 2006 - od@suse.de + +- added comments to update code +- fixed mangled section titles after update (#170579) +- 2.13.59 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.58.tar.bz2 New: ---- yast2-bootloader-2.13.59.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.odfDIv/_old 2006-05-10 20:52:20.000000000 +0200 +++ /var/tmp/diff_new_pack.odfDIv/_new 2006-05-10 20:52:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.58) +# spec file for package yast2-bootloader (Version 2.13.59) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.13.58 -Release: 2 +Version: 2.13.59 +Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.58.tar.bz2 +Source0: yast2-bootloader-2.13.59.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.58 +%setup -n yast2-bootloader-2.13.59 %build %{prefix}/bin/y2tool y2autoconf @@ -112,6 +112,10 @@ %changelog -n yast2-bootloader * Wed May 10 2006 - od@suse.de +- added comments to update code +- fixed mangled section titles after update (#170579) +- 2.13.59 +* Wed May 10 2006 - od@suse.de - fix broken consistency check for legacy iSeries with DASD only (#166378) - make it possible to manually add a value to selection list ++++++ yast2-bootloader-2.13.58.tar.bz2 -> yast2-bootloader-2.13.59.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.58/VERSION new/yast2-bootloader-2.13.59/VERSION --- old/yast2-bootloader-2.13.58/VERSION 2006-05-10 15:49:22.000000000 +0200 +++ new/yast2-bootloader-2.13.59/VERSION 2006-05-10 19:07:31.000000000 +0200 @@ -1 +1 @@ -2.13.58 +2.13.59 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.58/src/routines/lilolike.ycp new/yast2-bootloader-2.13.59/src/routines/lilolike.ycp --- old/yast2-bootloader-2.13.58/src/routines/lilolike.ycp 2006-05-10 15:44:23.000000000 +0200 +++ new/yast2-bootloader-2.13.59/src/routines/lilolike.ycp 2006-05-10 19:05:49.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: lilolike.ycp 29991 2006-04-11 14:36:14Z odabrunz $ + * $Id: lilolike.ycp 30834 2006-05-10 17:05:45Z odabrunz $ * */ { @@ -634,6 +634,12 @@ sections_to_recreate = add (sections_to_recreate, "xen"); } + // if replace == true, replace all sections that have a type in + // sections_to_recreate with a newly created version + // if replace == false, only adjust "append" line of "linux" section + // + // at the end of the loop, if one of the sections_to_recreate does not + // exist, create it foreach (string t, sections_to_recreate, { map<string,any> m = create_linux_section (t); boolean f_changed = false; @@ -672,6 +678,9 @@ return s; } }); + // if we did NOT change or replace the old section (meaning: there was + // none), but create_linux_section() gave us a new section, then + // prepend or append the section created by create_linux_section() if (! f_changed && m != $[]) { recreated = add (recreated, m["name"]:""); @@ -682,6 +691,12 @@ } }); + // now adjust these keys in sections that need it: + // - kernel + // - initrd + // - name + // - device (e.g. for SATA: /dev/hda -> /dev/sda) + // - append out = maplist (map<string,any> s, out, { string label = s["name"]:""; string type = s["original_name"]:label; @@ -699,12 +714,23 @@ } s["key"] = value; }); - if (s["kernel"]:"" == default_kernel + // If we did not replace the sections anyway, adjust the section titles: + // Does this section + // - use the default kernel of a linux section \ i.e. it uses the updated kernel + // - use the default initrd of a linux section / + // - contain the name of the first "linux" section read from disk in + // its name + // then, update the section name + if (!replace + && s["kernel"]:"" == default_kernel && s["initrd"]:"" == default_initrd && issubstring (s["name"]:"", read_default_section_name) && read_default_section_name != "" && read_default_section_name != default_name) { + // idea of this: + // orig_name == "linux": "Linux" -> "<new name>" + // orig_name == "failsafe": "Failsafe -- Linux" -> "Failsafe -- <new name>" y2milestone ("Updating label of section %1...", s["name"]:""); string old_name = s["name"]:""; integer i1 = search (old_name, read_default_section_name); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...