Hello community, here is the log from the commit of package yast2-bootloader checked in at Fri Sep 21 18:06:19 CEST 2007. -------- --- yast2-bootloader/yast2-bootloader.changes 2007-09-20 21:02:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-09-21 16:21:00.874918000 +0200 @@ -1,0 +2,9 @@ +Fri Sep 21 16:19:02 CEST 2007 - od@suse.de + +- run delayed bootloader_entry at the very end of the update, when + the migrated bootloader configuration (including device mapping) + has already been written (#309837) +- added some comments +- 2.15.25 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.15.24.tar.bz2 New: ---- yast2-bootloader-2.15.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.G16201/_old 2007-09-21 18:06:04.000000000 +0200 +++ /var/tmp/diff_new_pack.G16201/_new 2007-09-21 18:06:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.15.24) +# spec file for package yast2-bootloader (Version 2.15.25) # # 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.24 +Version: 2.15.25 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.15.24.tar.bz2 +Source0: yast2-bootloader-2.15.25.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.24 +%setup -n yast2-bootloader-2.15.25 %build %{prefix}/bin/y2tool y2autoconf @@ -94,6 +94,12 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* 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) + has already been written (#309837) +- added some comments +- 2.15.25 * Thu Sep 20 2007 - od@suse.de - log the contents of the perl-BL_delayed_exec script (#309837) - 2.15.24 ++++++ yast2-bootloader-2.15.24.tar.bz2 -> yast2-bootloader-2.15.25.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.24/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.15.25/src/clients/bootloader_finish.ycp --- old/yast2-bootloader-2.15.24/src/clients/bootloader_finish.ycp 2007-08-31 12:05:41.000000000 +0200 +++ new/yast2-bootloader-2.15.25/src/clients/bootloader_finish.ycp 2007-09-21 16:18:18.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: bootloader_finish.ycp 40623 2007-08-30 13:49:53Z pth $ + * $Id: bootloader_finish.ycp 41027 2007-09-21 14:18:17Z odabrunz $ * */ @@ -167,8 +167,11 @@ Update::updateVersion); } - if (retcode) - return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); + if (retcode) { + // perl-BL delayed section removal + Bootloader::RunDelayedUpdates(); + return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); + } else return retcode; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.24/src/modules/BootCommon.ycp new/yast2-bootloader-2.15.25/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.15.24/src/modules/BootCommon.ycp 2007-08-31 12:05:43.000000000 +0200 +++ new/yast2-bootloader-2.15.25/src/modules/BootCommon.ycp 2007-09-21 16:18:19.000000000 +0200 @@ -15,7 +15,7 @@ * Joachim Plack <jplack@suse.de> * Olaf Dabrunz <od@suse.de> * - * $Id: BootCommon.ycp 40623 2007-08-30 13:49:53Z pth $ + * $Id: BootCommon.ycp 41027 2007-09-21 14:18:17Z odabrunz $ * */ @@ -466,6 +466,12 @@ // version etc. pp. whatever (currently version-flavor) attached. // FIXME: also do this for xen and xenpae kernels as found below // + // Note: originally, we wanted to find out the kernel file names during + // installation proposal when the files are not yet installed. But not + // all the necessary interfaces work at that time. Now, this variant is + // only run in the "running system", and could as well look at the + // installed files. + // // First of all, we have to initialize the RPM database Pkg::TargetInit ( "/", // installed system @@ -515,6 +521,8 @@ files_filtered[0]:"" ); } else { + // the links are shown in the proposal; at the end of an installation, + // in bootloader_finish, they will be resolved to the real filenames kernel_fn = "/boot/" + Kernel::GetBinary () + (title == "wildcard" ? "-*" : ""); initrd_fn = "/boot/initrd" + (title == "wildcard" ? "-*" : ""); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.24/src/modules/BootELILO.ycp new/yast2-bootloader-2.15.25/src/modules/BootELILO.ycp --- old/yast2-bootloader-2.15.24/src/modules/BootELILO.ycp 2007-09-20 18:43:08.000000000 +0200 +++ new/yast2-bootloader-2.15.25/src/modules/BootELILO.ycp 2007-09-21 16:18:20.000000000 +0200 @@ -16,7 +16,7 @@ * Andreas Schwab <schwab@suse.de> * Philipp Thomas <pth@suse.de> * - * $Id: BootELILO.ycp 41000 2007-09-20 16:43:07Z odabrunz $ + * $Id: BootELILO.ycp 41027 2007-09-21 14:18:17Z odabrunz $ * */ @@ -391,8 +391,6 @@ BootCommon::globals["timeout"] = "8"; BootCommon::globals["append"] = BootArch::DefaultKernelParams (""); - // perl-BL delayed section removal - BootCommon::RunDelayedUpdates (); BootCommon::UpdateSections (true, CreateLinuxSection); // FIXME EFI entry name } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.24/src/modules/BootGRUB.ycp new/yast2-bootloader-2.15.25/src/modules/BootGRUB.ycp --- old/yast2-bootloader-2.15.24/src/modules/BootGRUB.ycp 2007-09-20 18:43:08.000000000 +0200 +++ new/yast2-bootloader-2.15.25/src/modules/BootGRUB.ycp 2007-09-21 16:18:21.000000000 +0200 @@ -14,7 +14,7 @@ * Joachim Plack <jplack@suse.de> * Philipp Thomas <pth@suse.de> * - * $Id: BootGRUB.ycp 41000 2007-09-20 16:43:07Z odabrunz $ + * $Id: BootGRUB.ycp 41027 2007-09-21 14:18:17Z odabrunz $ * */ @@ -957,8 +957,6 @@ */ global define void Update () { BootCommon::UpdateDeviceMap (); - // perl-BL delayed section removal - BootCommon::RunDelayedUpdates (); BootCommon::UpdateSections (true, CreateLinuxSection); BootCommon::UpdateGlobals (); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.24/src/modules/BootLILO.ycp new/yast2-bootloader-2.15.25/src/modules/BootLILO.ycp --- old/yast2-bootloader-2.15.24/src/modules/BootLILO.ycp 2007-09-20 18:43:09.000000000 +0200 +++ new/yast2-bootloader-2.15.25/src/modules/BootLILO.ycp 2007-09-21 16:18:22.000000000 +0200 @@ -13,7 +13,7 @@ * Jiri Srain <jsrain@suse.cz> * Philipp Thomas <pth@suse.de> * - * $Id: BootLILO.ycp 41000 2007-09-20 16:43:07Z odabrunz $ + * $Id: BootLILO.ycp 41027 2007-09-21 14:18:17Z odabrunz $ * */ @@ -198,8 +198,6 @@ */ global void Update () { BootCommon::UpdateDeviceMap (); - // perl-BL delayed section removal - BootCommon::RunDelayedUpdates (); BootCommon::UpdateSections (true, BootCommon::CreateLinuxSection); BootCommon::UpdateGlobals (); BootCommon::loader_device diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.24/src/modules/Bootloader.ycp new/yast2-bootloader-2.15.25/src/modules/Bootloader.ycp --- old/yast2-bootloader-2.15.24/src/modules/Bootloader.ycp 2007-08-31 12:05:43.000000000 +0200 +++ new/yast2-bootloader-2.15.25/src/modules/Bootloader.ycp 2007-09-21 16:18:24.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: Bootloader.ycp 40623 2007-08-30 13:49:53Z pth $ + * $Id: Bootloader.ycp 41027 2007-09-21 14:18:17Z odabrunz $ * */ @@ -920,6 +920,18 @@ * @param section string section to boot * @return boolean true on success */ + global define void RunDelayedUpdates() + { + // perl-BL delayed section removal + BootCommon::RunDelayedUpdates (); + return; + } + + /** + * Set section to boot on next reboot + * @param section string section to boot + * @return boolean true on success + */ global define boolean FlagOnetimeBoot(string section) { return blFlagOnetimeBoot (section); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.24/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.15.25/src/modules/BootPOWERLILO.ycp --- old/yast2-bootloader-2.15.24/src/modules/BootPOWERLILO.ycp 2007-09-20 18:43:10.000000000 +0200 +++ new/yast2-bootloader-2.15.25/src/modules/BootPOWERLILO.ycp 2007-09-21 16:18:23.000000000 +0200 @@ -16,7 +16,7 @@ * Olaf Dabrunz <od@suse.de> * Philipp Thomas <pth@suse.de> * - * $Id: BootPOWERLILO.ycp 41000 2007-09-20 16:43:07Z odabrunz $ + * $Id: BootPOWERLILO.ycp 41027 2007-09-21 14:18:17Z odabrunz $ * */ @@ -969,9 +969,6 @@ */ global void Update () { - // perl-BL delayed section removal - BootCommon::RunDelayedUpdates (); - /** * Firstly update sections of bootloader configuration and modify internal * structures as needed. This means right now: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.24/VERSION new/yast2-bootloader-2.15.25/VERSION --- old/yast2-bootloader-2.15.24/VERSION 2007-09-20 21:00:07.000000000 +0200 +++ new/yast2-bootloader-2.15.25/VERSION 2007-09-21 16:18:38.000000000 +0200 @@ -1 +1 @@ -2.15.24 +2.15.25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org