Author: juhliarik Date: Thu May 6 12:45:48 2010 New Revision: 61953 URL: http://svn.opensuse.org/viewcvs/yast?rev=61953&view=rev Log: added fix for deleting gfxmenu from GRUB bnc#602743 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=61953&r1=61952&r2=61953&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Thu May 6 12:45:48 2010 @@ -1 +1 @@ -2.17.72 +2.17.73 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=61953&r1=61952&r2=61953&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 Thu May 6 12:45:48 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 6 12:33:08 CEST 2010 - juhliarik@suse.cz + +- added fix for deleting gfxmenu in console is defined (bnc#602743) +- 2.17.73 + +------------------------------------------------------------------- Thu Mar 25 16:37:08 CET 2010 - juhliarik@suse.cz - added fix for deleting gfxmenu (bnc#583334) 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=61953&r1=61952&r2=61953&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 Thu May 6 12:45:48 2010 @@ -36,6 +36,8 @@ import "Package"; import "PackagesProposal"; +import "Kernel"; + import "Linuxrc"; @@ -851,6 +853,27 @@ y2error ("No generic propose function available"); } +/** bnc#602743c#10 - YaST2 always writes 42 as baudrate in /etc/inittab + * Check if console is defined in installation args + * + * @return boolean true if console is defined in Kernel::GetCmdLine () + */ +boolean checkKernelCmdForConsole() +{ + boolean ret = false; + if (Mode::installation()) + { + string kernel_cmd = Kernel::GetCmdLine (); + if (search(tolower(kernel_cmd), "console=") != nil) + { + ret = true; + y2milestone("Remove gfxmenu -> it is added like installation arg: %1", kernel_cmd); + } + + } + return ret; +} + /** bnc# 346576,568295 - Bootloader configuration doesn't work for serial output * Function check if settings need to remove gfxmenu * @@ -870,12 +893,16 @@ y2milestone("Remove gfxmenu -> defined serial console"); return true; } + // bnc#602743c#10 - YaST2 always writes 42 as baudrate in /etc/inittab + if (checkKernelCmdForConsole() && haskey(globals, "gfxmenu")) + return true; if ((globals["gfxmenu"]:"" == "none") && (haskey(globals, "gfxmenu"))) { y2milestone("Remove gfxmenu -> disabled gfxmenu"); return true; } + return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org