Author: juhliarik Date: Mon Jan 11 14:31:20 2010 New Revision: 60310 URL: http://svn.opensuse.org/viewcvs/yast?rev=60310&view=rev Log: added fix for deleting gfxmenu if serial console is configured bnc#568295 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION?rev=60310&r1=60309&r2=60310&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Mon Jan 11 14:31:20 2010 @@ -1 +1 @@ -2.17.66 +2.17.67 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes?rev=60310&r1=60309&r2=60310&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Mon Jan 11 14:31:20 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 11 13:18:28 CET 2010 - juhliarik@suse.cz + +- added fix for deleting gfxmenu if serial console is used + (bnc#568295) +- 2.17.67 + +------------------------------------------------------------------- Thu Jan 7 14:57:34 CET 2010 - juhliarik@suse.cz - added fix for data in device.map if MD RAID from Intel is used Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp?rev=60310&r1=60309&r2=60310&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp Mon Jan 11 14:31:20 2010 @@ -851,6 +851,34 @@ y2error ("No generic propose function available"); } +/** bnc# 346576,568295 - Bootloader configuration doesn't work for serial output + * Function check if settings need to remove gfxmenu + * + * @return boolean - true if gfxmenu needs to be removed + */ + +boolean removeGFXMenu () +{ + if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) + { + y2milestone("Remove gfxmenu -> selected trusted grub"); + return true; + } + + if ((globals["serial"]:nil != "") && (globals["serial"]:nil != nil) && (haskey(globals, "gfxmenu"))) + { + y2milestone("Remove gfxmenu -> defined serial console"); + return true; + } + + if ((globals["gfxmenu"]:"" == "none") && (haskey(globals, "gfxmenu"))) + { + y2milestone("Remove gfxmenu -> disabled gfxmenu"); + return true; + } + return false; +} + /** * Save all bootloader configuration files to the cache of the PlugLib * PlugLib must be initialized properly !!! @@ -908,7 +936,8 @@ return $[BootCommon::Dev2MountByDev(k) : v]; }); y2milestone ("device map after mapping %1", my_device_mapping); - if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) + + if (removeGFXMenu()) globals = remove(globals, "gfxmenu"); // convert XEN section to linux section id running in domU -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org