Author: juhliarik Date: Mon Aug 6 17:19:48 2007 New Revision: 40023 URL: http://svn.opensuse.org/viewcvs/yast?rev=40023&view=rev Log: correction for icon and adding crashkernel parameter for booting system Modified: trunk/kdump/VERSION trunk/kdump/src/Kdump.ycp trunk/kdump/src/dialogs.ycp trunk/kdump/src/kdump.desktop trunk/kdump/src/uifunctions.ycp trunk/kdump/src/wizards.ycp Modified: trunk/kdump/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/VERSION?rev=40023&r1=40022&r2=40023&view=diff ============================================================================== --- trunk/kdump/VERSION (original) +++ trunk/kdump/VERSION Mon Aug 6 17:19:48 2007 @@ -1 +1 @@ -2.13.0 +2.15.0 Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=40023&r1=40022&r2=40023&view=diff ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Mon Aug 6 17:19:48 2007 @@ -260,13 +260,20 @@ boolean ReadKdumpKernelParam () { string result = Bootloader::getKernelParam (Bootloader::getDefaultSection (), "crashkernel"); + //Popup::Message(result); if (result == "false") { crashkernel_param = false; + add_crashkernel_param = false; } else { crashkernel_param = true; + add_crashkernel_param = true; } crashkernel_param_value = result; + if (result != "false") + alocated_memory = substring(result,0,find(result,"@")); + + //Popup::Message(alocated_memory); return true; } @@ -368,15 +375,27 @@ return false; } - if ((!crashkernel_param) || (crash_value != crashkernel_param_value)) { - result = Bootloader::setKernelParam (Bootloader::getDefaultSection (), "crashkernel", crash_value); + if ((!crashkernel_param) || ((crash_value != crashkernel_param_value) && (add_crashkernel_param))) { + + //Popup::Message(Bootloader::getDefaultSection ()); + result = Bootloader::setKernelParam (Bootloader::getDefaultSection (), "crashkernel", crash_value); // + //Popup::Message(crash_value); Popup::Message("For applying changes is necessary reboot."); + + return result; } + + //start kernel-kdump at boot Service::Enable("kernel-kdump"); } else { - + if (crashkernel_param) { + //delete crashkernel paramter from bootloader + result = Bootloader::setKernelParam (Bootloader::getDefaultSection (), "crashkernel", "false"); + Popup::Message("For applying changes is necessary reboot."); + } Service::Disable("kernel-kdump"); + return result; } return true; } Modified: trunk/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/dialogs.ycp?rev=40023&r1=40022&r2=40023&view=diff ============================================================================== --- trunk/kdump/src/dialogs.ycp (original) +++ trunk/kdump/src/dialogs.ycp Mon Aug 6 17:19:48 2007 @@ -42,7 +42,7 @@ include "kdump/uifunctions.ycp"; void DisBackButton (string key) { - Wizard::SetTitleIcon("yast-sysconfig"); + Wizard::SetTitleIcon("yast-kdump"); UI::ChangeWidget(`id(`back), `Enabled, false); } Modified: trunk/kdump/src/kdump.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/kdump.desktop?rev=40023&r1=40022&r2=40023&view=diff ============================================================================== --- trunk/kdump/src/kdump.desktop (original) +++ trunk/kdump/src/kdump.desktop Mon Aug 6 17:19:48 2007 @@ -1,6 +1,7 @@ [Desktop Entry] Type=Application -Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-System; + X-KDE-ModuleType=Library X-KDE-RootOnly=true @@ -8,17 +9,17 @@ X-KDE-Library=yast2 X-SuSE-YaST-Call=kdump -X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Group=System X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true X-SuSE-YaST-AutoInst= X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= -X-SuSE-YaST-AutoInstResource=kdump +X-SuSE-YaST-AutoInstResource= -Icon=yast-sysconfig +Icon=yast-kdump Exec=/sbin/yast2 kdump -Name=Kdump -GenericName=kdump +Name=Kernel Kdump +GenericName=Kernel Kdump Configuration Tool X-KDE-SubstituteUID=true Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=40023&r1=40022&r2=40023&view=diff ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Mon Aug 6 17:19:48 2007 @@ -140,7 +140,7 @@ * Function initializes option "Enable/Disable kdump" */ void InitEnableDisalbeKdump (string key) { - if (Kdump::crashkernel_param) { + if (Kdump::add_crashkernel_param) { UI::ChangeWidget(`id("EnableDisalbeKdump"),`Value,"enable_kdump"); } else { Modified: trunk/kdump/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/wizards.ycp?rev=40023&r1=40022&r2=40023&view=diff ============================================================================== --- trunk/kdump/src/wizards.ycp (original) +++ trunk/kdump/src/wizards.ycp Mon Aug 6 17:19:48 2007 @@ -90,7 +90,7 @@ ]; Wizard::CreateDialog(); - Wizard::SetTitleIcon("yast-sysconfig"); + Wizard::SetTitleIcon("yast-kdump"); any ret = Sequencer::Run(aliases, sequence); UI::CloseDialog(); return ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org