Author: juhliarik Date: Fri Jan 8 13:57:53 2010 New Revision: 60287 URL: http://svn.opensuse.org/viewcvs/yast?rev=60287&view=rev Log: added fix for deleting offset for crashkernel value Modified: branches/SuSE-Code-11-SP1-Branch/kdump/VERSION branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp Modified: branches/SuSE-Code-11-SP1-Branch/kdump/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump/VERSION?rev=60287&r1=60286&r2=60287&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/VERSION Fri Jan 8 13:57:53 2010 @@ -1 +1 @@ -2.17.17 +2.17.18 Modified: branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes?rev=60287&r1=60286&r2=60287&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/package/yast2-kdump.changes Fri Jan 8 13:57:53 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 7 15:22:05 CET 2010 - juhliarik@suse.cz + +- deleted offset "@16M" from crashkernel option (bnc#565122) and + (bnc#563905) +- 2.17.18 + +------------------------------------------------------------------- Tue Nov 10 11:47:35 CET 2009 - juhliarik@suse.cz - disbaled kdump in YaST on s390 (bnc#524164) Modified: branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp?rev=60287&r1=60286&r2=60287&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/src/Kdump.ycp Fri Jan 8 13:57:53 2010 @@ -364,7 +364,24 @@ string result = ""; string kernel_boot_options = ""; integer min_dif_size = 1000; - + + if (Mode::update()) + { + result = Bootloader::getDefaultSection (); + integer section_position = -1; + foreach(map section, BootCommon::sections, + { + section_position = section_position +1; + string name = tostring(section["name"]:nil); + + if ((name == result) && (section["xen_append"]:nil != nil)) + { + section_pos = section_position; + kernel_version = "xen"; + } + }); + return result; + } // reading bootloader settings boolean old_progress = Progress::set (false); Bootloader::Read(); @@ -539,11 +556,9 @@ string crash_value = ""; crash_value = alocated_memory+"M"; - if ((Arch::i386()) ||(Arch::x86_64())) { - crash_value = crash_value + "@16M"; - y2milestone("Common offset 16M"); - } else if ((Arch::ia64()) || Arch::ppc64()) { - y2milestone("ia64 or ppc64 platform without offset"); + // bnc#563905 problem with offset in crashkernel + if ((Arch::i386()) ||(Arch::x86_64()) || (Arch::ia64()) || Arch::ppc64()) { + y2milestone("i386, x86_64, ia64 and ppc64 platforms are without offset"); } else { if (Mode::normal()) Popup::Error(_("Unsupported architecture, \"crashkernel\" was not added")); @@ -574,8 +589,9 @@ { crash_value = getAlocatedMemory(crash)+"M"; - if ((Arch::i386()) ||(Arch::x86_64()) || Arch::ppc64()) - crash_value = crash_value + "@16M"; + // bnc#563905 problem with offset in crashkernel + //if ((Arch::i386()) ||(Arch::x86_64()) || Arch::ppc64()) + // crash_value = crash_value + "@16M"; } y2milestone("Converting crashkernel value from: (%1) to :(%2)",crash, crash_value); @@ -945,6 +961,17 @@ if (Mode::autoinst()) crash_value = crashkernel_param_value; + + + if (Mode::update()) + { + if (search(crash_value, "@") != nil) + { + list<string> tmp_crash_value = splitstring(crash_value, "@"); + crash_value = tmp_crash_value[0]:""; + y2milestone("Delete offset crashkernel value: %1", crash_value); + } + } // write crashkernel option to boot section if (section_pos == -1) { @@ -1054,6 +1081,19 @@ } /** + * Update crashkernel argument during update of OS + * @return true on success + */ + +global boolean Update() +{ + y2milestone("Update kdump settings"); + ReadKdumpKernelParam (); + WriteKdumpBootParameter (); + return true; +} + +/** * Write all kdump settings * @return true on success */ Modified: branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp?rev=60287&r1=60286&r2=60287&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/kdump/src/kdump_finish.ycp Fri Jan 8 13:57:53 2010 @@ -50,7 +50,11 @@ // propose settings for kdump if autoyast doesn't include settings for yast2-kdump if ((!Kdump::import_called) && (Mode::autoinst())) Kdump::Propose(); - Kdump::Write(); + + if (Mode::update()) + Kdump::Update(); + else + Kdump::Write(); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org