[yast-commit] r46420 - in /trunk/bootloader/src: clients/bootloader_finish.ycp modules/BootCommon.ycp modules/Bootloader.ycp

Author: juhliarik Date: Fri Apr 11 15:53:31 2008 New Revision: 46420 URL: http://svn.opensuse.org/viewcvs/yast?rev=46420&view=rev Log: added handling options for calling kexec instead of reboot on the end of the 1st stage (fate #303395) M bootloader/src/clients/bootloader_finish.ycp * added calling function Bootloader::CopyKernelInird() M bootloader/src/modules/Bootloader.ycp * added function CopyKernelInird() M bootloader/src/modules/BootCommon.ycp * added installation kexec-tools Modified: trunk/bootloader/src/clients/bootloader_finish.ycp trunk/bootloader/src/modules/BootCommon.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=46420&r1=46419&r2=46420&view=diff ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Fri Apr 11 15:53:31 2008 @@ -26,6 +26,9 @@ import "BootCommon"; import "Update"; +// added for fate# 303395 +import "Linuxrc"; + any ret = nil; string func = ""; @@ -164,11 +167,10 @@ if (!Mode::update ()) { - //retcode = Bootloader::Write (); retcode = Bootloader::WriteInstallation(); } else - { + { retcode = Bootloader::Update ( Installation::installedVersion, Installation::updateVersion); @@ -178,10 +180,19 @@ // re-read external changes, then boot through to second stage of // installation or update Bootloader::Read (); - return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); + // fate #303395: Use kexec to avoid booting between first and second stage + // copy vmlinuz, initrd and flush kernel option into /var/lib/YaST2 + if (Linuxrc::InstallInf ("kexec_reboot") != "0") + Bootloader::CopyKernelInird(); + else + y2milestone("Installation started with kexec_reboot set 0 or without kexec_reboot option"); + + + return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); } else return retcode; + } else { Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=46420&r1=46419&r2=46420&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Fri Apr 11 15:53:31 2008 @@ -33,6 +33,8 @@ import "String"; import "Pkg"; +import "Linuxrc"; + // General bootloader settings @@ -987,8 +989,19 @@ && contains(bootloaders, bootloader) && ! Mode::test ()) { - list<string> bootloader_packages = - bootloader_attribs[bootloader, "required_packages"]:[]; + // added kexec-tools fate# 303395 + // if kexec option is equal 0 or running live installation + // doesn't install kexec-tools + + list<string> bootloader_packages =[]; + if ((! Mode::live_installation()) + && (Linuxrc::InstallInf ("kexec_reboot") != "0")) + { + bootloader_packages = bootloader_attribs[bootloader, "kexec-tools", "required_packages"]:[]; + } else { + bootloader_packages = bootloader_attribs[bootloader, "required_packages"]:[]; + } + // don't configure package manager during autoinstallation preparing if (Mode::normal () && (! (Mode::config () || Mode::repair ()))) { Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloader.ycp?rev=46420&r1=46419&r2=46420&view=diff ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Fri Apr 11 15:53:31 2008 @@ -30,6 +30,7 @@ import "Progress"; import "Stage"; import "Storage"; + import "Directory"; // import "BootABOOT"; import "BootELILO"; @@ -38,6 +39,8 @@ // import "BootS390"; import "BootGRUB"; import "BootPOWERLILO"; // The ppc-LILO File + //fate 303395 + import "ProductFeatures"; // interface for clients global define map Export (); @@ -606,9 +609,11 @@ // read current settings... ret = blRead (true, false); - // delete duplicated sections - DelDuplicatedSections(); - + if (! Mode::live_installation()) + { + // delete duplicated sections + DelDuplicatedSections(); + } if (BootCommon::write_settings["save_all"]:false) BootCommon::save_all = true; if (BootCommon::save_all) @@ -719,6 +724,7 @@ y2milestone("linux_default: %1", linux_default); y2milestone("linux_failsafe: %1", linux_failsafe); + y2milestone("Boot sections BEFORE deleting: %1", BootCommon::sections); BootCommon::sections=filter(map section, BootCommon::sections, { @@ -740,7 +746,6 @@ return true; }); y2milestone("Boot sections AFTER deleting: %1", BootCommon::sections); - y2milestone("End deleting duplicated boot sections"); } // write mode settings function @@ -1186,4 +1191,94 @@ return ret; } + +/** + * Copy initrd and kernel on the end of instalation + * (1st stage) + * @return boolean on success + */ +// fate #303395 Use kexec to avoid booting between first and second stage +// copy kernel and initrd to /var/lib/YaST +// run kernel via kexec instead of reboot +// if not success then reboot... +global define boolean CopyKernelInird() +{ + y2milestone("CopyKernelInird: start copy kernel and inird"); + + if (Mode::live_installation()) + { + y2milestone("Running live_installation without using kexec"); + return true; + } + + if (ProductFeatures::GetBooleanFeature ("globals", "kexec_reboot") != true) + { + y2milestone("Option kexec_reboot is false. kexec will not be used."); + return true; + } + // create defualt sections + map linux_default = BootCommon::CreateLinuxSection ("linux"); + + y2milestone("linux_default: %1", linux_default); + + map default_section = $[]; + + string name = getDefaultSection (); + // find default section in BootCommon::sections + foreach(map section, BootCommon::sections, + { + if ((find(tostring(section["name"]:""),name) != -1) + && (section["root"]:nil == linux_default["root"]:nil) + && (section["original_name"]:"" != "failsafe")) + { + y2milestone("default section: %1", section); + default_section = section; + }; + }); + + // create directory /var/lib/YaST2 + WFM::Execute(.local.mkdir, "/var/lib/YaST2"); + + // build command for copy kernel and initrd to /var/lib/YaST during instalation + string cmd = nil; + + cmd = sformat("/bin/cp %1%2 %1%3 %4", Installation::destdir, tostring(default_section["image"]:""), + tostring(default_section["initrd"]:""), Directory::vardir); + + y2milestone("Command for copy: %1", cmd); + map out = (map) WFM::Execute (.local.bash_output, cmd); + if (out["exit"]:nil != 0) + { + y2error ("Copy kernel and initrd failed, output: %1", out); + return false; + } + + if (default_section["root"]:"" == "") + { + y2milestone("root is not defined in default section."); + return false; + } + + if (default_section["vgamode"]:"" == "") + { + y2milestone("vgamode is not defined in default section."); + return false; + } + + // flush kernel options into /var/lib/YaST/kernel_params + cmd = sformat("echo \"root=%1 %2 vga=%3\" > %4/kernel_params", + tostring(default_section["root"]:""), tostring(default_section["append"]:""), + tostring(default_section["vgamode"]:""), Directory::vardir); + + y2milestone("Command for flushing kernel args: %1", cmd); + out = (map) WFM::Execute (.local.bash_output, cmd); + if (out["exit"]:nil != 0) + { + y2error ("Flushing kernel params failed, output: %1", out); + return false; + } + + return true; +} + } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org