[yast-commit] r53034 - in /trunk/bootloader: package/yast2-bootloader.changes src/grub/misc.ycp src/modules/BootELILO.ycp src/modules/BootPOWERLILO.ycp src/modules/Bootloader.ycp src/routines/misc.ycp

Author: juhliarik Date: Fri Nov 7 10:33:33 2008 New Revision: 53034 URL: http://svn.opensuse.org/viewcvs/yast?rev=53034&view=rev Log: added several fixes: - powerlilo (writing kdump settings) - using fix_chs - double boot entry for UEFI Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootELILO.ycp trunk/bootloader/src/modules/BootPOWERLILO.ycp trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=53034&r1=53033&r2=53034&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Nov 7 10:33:33 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Nov 7 10:29:26 CET 2008 - juhliarik@suse.cz + +- added fix for writing crashkernel to bootloader from kdump on ppc + (bnc #441547) +- added fix for double boot entry twice by efibootmgr (bnc #438215) +- added fix for using fix_chs (bnc #367304) +- 2.17.36 + +------------------------------------------------------------------- Fri Oct 31 12:49:14 CET 2008 - juhliarik@suse.cz - added better proposal checking elilo ,lilo Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=53034&r1=53033&r2=53034&view=diff ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Fri Nov 7 10:33:33 2008 @@ -401,14 +401,6 @@ integer exit = out["exit"]:0; y2milestone ("Command output: %1", out); ret = ret && (0 == exit); - command = sformat ("/usr/sbin/fix_chs %1 %2", - mbr_dev, - num); - y2milestone ("Running command %1", command); - out = (map)SCR::Execute (.target.bash_output, command); - exit = out["exit"]:0; - y2milestone ("Command output: %1", out); - ret = ret && (0 == exit); } } else Modified: trunk/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO.ycp?rev=53034&r1=53033&r2=53034&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootELILO.ycp (original) +++ trunk/bootloader/src/modules/BootELILO.ycp Fri Nov 7 10:33:33 2008 @@ -490,7 +490,22 @@ "--loader '\\efi\\SuSE\\elilo.efi' --write-signature >> %4 2>&1", BootCommon::globals["boot_efilabel"]:"", boot_disk, boot_part, bl_logfile ); - ret = ret && installBootLoader (bl_command, bl_logfile); + + // command for checking same boot entry in efi bnc #438215 (YaST creates efibootloader entry twice) + string cmd = sformat("/usr/sbin/efibootmgr -v | grep -c \"%1.*HD(%2.*File(.\\efi.\\SuSE.\\elilo.efi)\"", + BootCommon::globals["boot_efilabel"]:"", boot_part); + y2milestone("Command for checking same boot entry: %1", cmd); + + // check how many entries with same label and partition is actually in efi + map out = (map)SCR::Execute (.target.bash_output, cmd); + + // check number of same boot entries in efi + // if boot entry is added -> don't add it again + if (deletechars(out["stdout"]:"","\n") == "0") + ret = ret && installBootLoader (bl_command, bl_logfile); + else + y2milestone("Skip adding boot entry: %1 to EFI. There already exist: %2 with same label and partition.", + BootCommon::globals["boot_efilabel"]:"", deletechars(out["stdout"]:"","\n")); } Modified: trunk/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootPOWERLILO.ycp?rev=53034&r1=53033&r2=53034&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ trunk/bootloader/src/modules/BootPOWERLILO.ycp Fri Nov 7 10:33:33 2008 @@ -875,22 +875,25 @@ BootCommon::UpdateAppend (); } + // check if there is selected "none" bootloader + string bl = BootCommon::getLoaderType (false); + + if (bl == "none") + { + BootCommon::InitializeLibrary (init, bl); + return true; + } + if (! BootCommon::InitializeLibrary (init, "ppc")) // send current disk/partition information to perl-Bootloader BootCommon::SetDiskInfo (); - // Sanity check the sections list: we can only pass strings - // through the perl interface - list > sects = maplist (map s, BootCommon::sections, { - return (map) - filter (string k, any v, s, { return is (v, string); }); - }); - - // convert root device names in sections to the device names indicated by - // "mountby" - sects = maplist (map s, sects, { - s["root"] = BootCommon::Dev2MountByDev(s["root"]:""); - return s; + // convert + map my_globals = mapmap (string k , string v, BootCommon::globals, { + if ((k == "stage1_dev") || (regexpmatch(k, "^boot_.*custom$" )) || (k == "boot_chrp_custom")) + return $[k : BootCommon::Dev2MountByDev(v)]; + else + return $[k : v]; }); // FIXME: remove all mountpoints of type 'boot/boot' through some Storage::<func> @@ -899,12 +902,14 @@ // partitions in 'boot_<arch>_custom' and 'clone' (chrp) // ret = ret && BootCommon::SetDeviceMap (device_mapping); - ret = ret && BootCommon::SetSections (sects); - ret = ret && BootCommon::SetGlobal (BootCommon::globals); + ret = ret && BootCommon::SetSections (BootCommon::sections); + ret = ret && BootCommon::SetGlobal (my_globals); if (flush) ret = ret && BootCommon::CommitSettings (); importMetaData(); + + BootCommon::WriteToSysconf(false); return ret; } Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloader.ycp?rev=53034&r1=53033&r2=53034&view=diff ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Fri Nov 7 10:33:33 2008 @@ -41,6 +41,7 @@ import "BootPOWERLILO"; // The ppc-LILO File //fate 303395 import "ProductFeatures"; + import "Arch"; // interface for clients global define map Export (); @@ -1407,6 +1408,14 @@ return true; } + // check architecture for using kexec instead of reboot + if (Arch::ppc() || Arch::ia64() || Arch::s390()) + { + y2milestone("Skip using of kexec on this architecture"); + return true; + } + + // checking if installation run on VirtualBox string cmd = sformat("hwinfo --bios |grep Product"); y2milestone("Checking if installation run on VirtualBox command: %1", cmd); Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=53034&r1=53033&r2=53034&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Fri Nov 7 10:33:33 2008 @@ -1580,14 +1580,6 @@ integer exit = out["exit"]:0; y2milestone ("Command output: %1", out); ret = ret && (0 == exit); - command = sformat ("/usr/sbin/fix_chs %1 %2", - mbr_dev, - num); - y2milestone ("Running command %1", command); - out = (map)SCR::Execute (.target.bash_output, command); - exit = out["exit"]:0; - y2milestone ("Command output: %1", out); - ret = ret && (0 == exit); } } else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org