Author: odabrunz Date: Fri Sep 21 16:18:17 2007 New Revision: 41027 URL: http://svn.opensuse.org/viewcvs/yast?rev=41027&view=rev Log: - 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 Modified: trunk/bootloader/src/clients/bootloader_finish.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootELILO.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/BootLILO.ycp trunk/bootloader/src/modules/BootPOWERLILO.ycp trunk/bootloader/src/modules/Bootloader.ycp Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader_finish.ycp?rev=41027&r1=41026&r2=41027&view=diff ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Fri Sep 21 16:18:17 2007 @@ -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; } Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=41027&r1=41026&r2=41027&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Fri Sep 21 16:18:17 2007 @@ -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" ? "-*" : ""); Modified: trunk/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO.ycp?rev=41027&r1=41026&r2=41027&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootELILO.ycp (original) +++ trunk/bootloader/src/modules/BootELILO.ycp Fri Sep 21 16:18:17 2007 @@ -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 } Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=41027&r1=41026&r2=41027&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Fri Sep 21 16:18:17 2007 @@ -957,8 +957,6 @@ */ global define void Update () { BootCommon::UpdateDeviceMap (); - // perl-BL delayed section removal - BootCommon::RunDelayedUpdates (); BootCommon::UpdateSections (true, CreateLinuxSection); BootCommon::UpdateGlobals (); } Modified: trunk/bootloader/src/modules/BootLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootLILO.ycp?rev=41027&r1=41026&r2=41027&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootLILO.ycp (original) +++ trunk/bootloader/src/modules/BootLILO.ycp Fri Sep 21 16:18:17 2007 @@ -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 Modified: trunk/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootPOWERLILO.ycp?rev=41027&r1=41026&r2=41027&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ trunk/bootloader/src/modules/BootPOWERLILO.ycp Fri Sep 21 16:18:17 2007 @@ -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: Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloader.ycp?rev=41027&r1=41026&r2=41027&view=diff ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Fri Sep 21 16:18:17 2007 @@ -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); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org