Hello community, here is the log from the commit of package yast2-bootloader checked in at Tue Sep 25 21:18:02 CEST 2007. -------- --- yast2-bootloader/yast2-bootloader.changes 2007-09-21 16:21:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-09-25 19:07:26.723896000 +0200 @@ -1,0 +2,35 @@ +Tue Sep 25 13:53:18 CEST 2007 - od@suse.de + +- re-read bootloader config from system after the delayed run of + perl-Bootloader updates, then call FlagOnetimeBoot() based on + current setup (#328078) +- 2.15.28 + +------------------------------------------------------------------- +Tue Sep 25 11:09:55 CEST 2007 - od@suse.de + +- added logging to find problem in #328078 +- minor addition of whitespace +- 2.15.27 + +------------------------------------------------------------------- +Mon Sep 24 21:25:37 CEST 2007 - od@suse.de + +- Storage::GetTranslatedDevices() called often and uneccesarily + (related to #304269): + - added more logging to UpdateSections() + - added comments and FIXMEs + - disabled calling device name update again for "linux", + "failsafe" and "initrd" sections: this is not needed and would + reverse device name updates when forwards and backwards device + name update mappings exist + - enabled device name updates for "other" sections (booting other + installations) +- (related to #326372, see comment #12) + - fix "Interpreter" error: also activates persistent device + translation for device.map in yast2-bootloader (but no disk + device mappings are defined in yast2-storage, so devices remain + untranslated as of now) +- 2.15.26 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.15.25.tar.bz2 New: ---- yast2-bootloader-2.15.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.z31515/_old 2007-09-25 21:17:42.000000000 +0200 +++ /var/tmp/diff_new_pack.z31515/_new 2007-09-25 21:17:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.15.25) +# spec file for package yast2-bootloader (Version 2.15.28) # # Copyright (c) 2007 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.15.25 +Version: 2.15.28 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.15.25.tar.bz2 +Source0: yast2-bootloader-2.15.28.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: @@ -50,7 +50,7 @@ Olaf Dabrunz %prep -%setup -n yast2-bootloader-2.15.25 +%setup -n yast2-bootloader-2.15.28 %build %{prefix}/bin/y2tool y2autoconf @@ -94,6 +94,32 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Tue Sep 25 2007 - od@suse.de +- re-read bootloader config from system after the delayed run of + perl-Bootloader updates, then call FlagOnetimeBoot() based on + current setup (#328078) +- 2.15.28 +* Tue Sep 25 2007 - od@suse.de +- added logging to find problem in #328078 +- minor addition of whitespace +- 2.15.27 +* Mon Sep 24 2007 - od@suse.de +- Storage::GetTranslatedDevices() called often and uneccesarily + (related to #304269): + - added more logging to UpdateSections() + - added comments and FIXMEs + - disabled calling device name update again for "linux", + "failsafe" and "initrd" sections: this is not needed and would + reverse device name updates when forwards and backwards device + name update mappings exist + - enabled device name updates for "other" sections (booting other + installations) +- (related to #326372, see comment #12) + - fix "Interpreter" error: also activates persistent device + translation for device.map in yast2-bootloader (but no disk + device mappings are defined in yast2-storage, so devices remain + untranslated as of now) +- 2.15.26 * Fri Sep 21 2007 - od@suse.de - run delayed bootloader_entry at the very end of the update, when the migrated bootloader configuration (including device mapping) ++++++ yast2-bootloader-2.15.25.tar.bz2 -> yast2-bootloader-2.15.28.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.25/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.15.28/src/clients/bootloader_finish.ycp --- old/yast2-bootloader-2.15.25/src/clients/bootloader_finish.ycp 2007-09-21 16:18:18.000000000 +0200 +++ new/yast2-bootloader-2.15.28/src/clients/bootloader_finish.ycp 2007-09-25 13:53:05.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: bootloader_finish.ycp 41027 2007-09-21 14:18:17Z odabrunz $ + * $Id: bootloader_finish.ycp 41082 2007-09-25 11:53:04Z odabrunz $ * */ @@ -170,6 +170,9 @@ if (retcode) { // perl-BL delayed section removal Bootloader::RunDelayedUpdates(); + // re-read external changes, then boot through to second stage of + // installation or update + Bootloader::Read (); return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); } else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.25/src/modules/BootCommon.ycp new/yast2-bootloader-2.15.28/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.15.25/src/modules/BootCommon.ycp 2007-09-21 16:18:19.000000000 +0200 +++ new/yast2-bootloader-2.15.28/src/modules/BootCommon.ycp 2007-09-25 11:09:41.000000000 +0200 @@ -15,7 +15,7 @@ * Joachim Plack <jplack@suse.de> * Olaf Dabrunz <od@suse.de> * - * $Id: BootCommon.ycp 41027 2007-09-21 14:18:17Z odabrunz $ + * $Id: BootCommon.ycp 41073 2007-09-25 09:09:41Z odabrunz $ * */ @@ -313,8 +313,9 @@ /** * Types of sections that should be updated (changed device names) */ -global list<string> update_section_types - = [ "linux", "failsafe", "initrd", "floppy" ]; + // FIXME: see FIXME in lilolike.ycp:899 +global list<string> update_section_types = [ "floppy", "other" ]; +// = [ "linux", "failsafe", "initrd", "floppy" ]; /** * List of all supported bootloaders @@ -634,7 +635,7 @@ }); // convert device names in device map to the kernel device names - map<string,string> device_mapping = + device_mapping = mapmap (string k , string v, device_mapping, { return $[BootCommon::MountByDev2Dev(k) : v]; }); @@ -1034,9 +1035,10 @@ foreach (map<string,any> s, BootCommon::sections, { index = index + 1; if (s["name"]:"" == section_name) - sectnum = index; + sectnum = index; }); + y2milestone ("ret: %1", sectnum); return sectnum; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.25/src/routines/lilolike.ycp new/yast2-bootloader-2.15.28/src/routines/lilolike.ycp --- old/yast2-bootloader-2.15.25/src/routines/lilolike.ycp 2007-09-20 20:59:33.000000000 +0200 +++ new/yast2-bootloader-2.15.28/src/routines/lilolike.ycp 2007-09-24 21:25:22.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: lilolike.ycp 41005 2007-09-20 18:59:32Z odabrunz $ + * $Id: lilolike.ycp 41067 2007-09-24 19:25:21Z odabrunz $ * */ { @@ -736,6 +736,7 @@ f_changed = true; if (replace && m != $[]) { + y2milestone ("Recreated section %1: %2", label, m); recreated = add (recreated, label); return m; } @@ -766,6 +767,7 @@ // prepend or append the section created by create_linux_section() if (! f_changed && m != $[]) { + y2milestone ("Recreated section: %1", m); recreated = add (recreated, m["name"]:""); if (t == "linux") out = prepend (out, m); @@ -773,6 +775,7 @@ out = add (out, m); } }); + y2milestone ("All recreated sections: %1", recreated); // for grub and replace-mode only: // convert sections that boot "other" installations (another Linux, Windows @@ -889,7 +892,16 @@ y2milestone ("... to %1", s["name"]:""); } + // Update device names in sections for certain section types, if the + // section has not been recreated anyway + // FIXME: never update device names twice! foreach (string key, ["root", "chainloader"], { + // FIXME: for some reason, this used to update "linux" and + // "failsafe" even if they have been recreated; but "other" + // sections were never updated -- since there are no calls to + // UpdateSections() with replace == false, ATM we disable updating + // "linux" and "failsafe", and add "other", seed + // BootCommon::update_section_types if ((contains (update_section_types, type) && ! contains (recreated, label)) || key == "chainloader") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.25/VERSION new/yast2-bootloader-2.15.28/VERSION --- old/yast2-bootloader-2.15.25/VERSION 2007-09-21 16:18:38.000000000 +0200 +++ new/yast2-bootloader-2.15.28/VERSION 2007-09-25 13:53:13.000000000 +0200 @@ -1 +1 @@ -2.15.25 +2.15.28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org