Hello community,
here is the log from the commit of package yast2-kdump
checked in at Mon Nov 3 14:36:25 CET 2008.
--------
--- yast2-kdump/yast2-kdump.changes 2008-10-27 09:32:13.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-kdump/yast2-kdump.changes 2008-10-31 12:35:48.000000000 +0100
@@ -1,0 +2,17 @@
+Thu Oct 31 12:26:42 CET 2008 - juhliarik@suse.cz
+
+- added fix for unsupported option KDUMP_DUMPDEV (bnc #438976)
+- added fix for autoyast (bnc #436365)
+- fixed problem with value of crashkernel for XEN (bnc #439881)
+- added pacth for allocating double size of memory for ppc64
+ (bnc #431492)
+- added fix for problem with Popup in autoyast installation on
+ s390 (bnc #440277)
+- V 2.17.9
+
+-------------------------------------------------------------------
+Fri Oct 31 12:19:46 CET 2008 - ug@suse.de
+
+- is cloneable for autoyast
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-kdump-2.17.8.tar.bz2
New:
----
yast2-kdump-2.17.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-kdump.spec ++++++
--- /var/tmp/diff_new_pack.Z31134/_old 2008-11-03 14:36:03.000000000 +0100
+++ /var/tmp/diff_new_pack.Z31134/_new 2008-11-03 14:36:03.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-kdump (Version 2.17.8)
+# spec file for package yast2-kdump (Version 2.17.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-kdump
-Version: 2.17.8
+Version: 2.17.9
Release: 1
License: GPL v2 only
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-kdump-2.17.8.tar.bz2
+Source0: yast2-kdump-2.17.9.tar.bz2
Prefix: /usr
Requires: yast2 yast2-storage yast2-bootloader
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-storage yast2-testsuite
@@ -43,7 +43,7 @@
Jozef Uhliarik
%prep
-%setup -n yast2-kdump-2.17.8
+%setup -n yast2-kdump-2.17.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,17 @@
/usr/share/YaST2/scrconf/*.scr
%doc %{prefix}/share/doc/packages/yast2-kdump
%changelog
+* Fri Oct 31 2008 juhliarik@suse.cz
+- added fix for unsupported option KDUMP_DUMPDEV (bnc #438976)
+- added fix for autoyast (bnc #436365)
+- fixed problem with value of crashkernel for XEN (bnc #439881)
+- added pacth for allocating double size of memory for ppc64
+ (bnc #431492)
+- added fix for problem with Popup in autoyast installation on
+ s390 (bnc #440277)
+- V 2.17.9
+* Fri Oct 31 2008 ug@suse.de
+- is cloneable for autoyast
* Fri Oct 24 2008 juhliarik@suse.cz
- added fix for problem with value of "KDUMP_KERNELVER"
(bnc #438222)
++++++ yast2-kdump-2.17.8.tar.bz2 -> yast2-kdump-2.17.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kdump-2.17.8/config/kdump.rnc new/yast2-kdump-2.17.9/config/kdump.rnc
--- old/yast2-kdump-2.17.8/config/kdump.rnc 2008-09-18 10:42:04.000000000 +0200
+++ new/yast2-kdump-2.17.9/config/kdump.rnc 2008-10-29 12:44:51.000000000 +0100
@@ -25,7 +25,6 @@
element KDUMP_SAVEDIR { text }? &
element KDUMP_KEEP_OLD_DUMPS { text }? &
element KDUMP_FREE_DISK_SIZE { text }? &
- element KDUMP_DUMPDEV { text }? &
element KDUMP_VERBOSE { text }? &
element KDUMP_DUMPLEVEL { text }? &
element KDUMP_DUMPFORMAT { text }? &
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kdump-2.17.8/src/kdump.desktop new/yast2-kdump-2.17.9/src/kdump.desktop
--- old/yast2-kdump-2.17.8/src/kdump.desktop 2008-07-21 16:04:37.000000000 +0200
+++ new/yast2-kdump-2.17.9/src/kdump.desktop 2008-10-31 12:24:55.000000000 +0100
@@ -18,6 +18,7 @@
X-SuSE-YaST-AutoInstResource=
X-SuSE-YaST-AutoInstPath=install
X-SuSE-YaST-AutoInstSchema=kdump.rnc
+X-SuSE-YaST-AutoInstClonable=true
Icon=yast-kdump
Exec=/sbin/yast2 kdump
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kdump-2.17.8/src/kdump_finish.ycp new/yast2-kdump-2.17.9/src/kdump_finish.ycp
--- old/yast2-kdump-2.17.8/src/kdump_finish.ycp 2008-07-21 16:04:37.000000000 +0200
+++ new/yast2-kdump-2.17.9/src/kdump_finish.ycp 2008-10-29 13:44:49.000000000 +0100
@@ -47,6 +47,9 @@
}
else if (func == "Write")
{
+ // propose settings for kdump if autoyast doesn't include settings for yast2-kdump
+ if ((!Kdump::import_called) && (Mode::autoinst()))
+ Kdump::Propose();
Kdump::Write();
}
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kdump-2.17.8/src/Kdump.ycp new/yast2-kdump-2.17.9/src/Kdump.ycp
--- old/yast2-kdump-2.17.8/src/Kdump.ycp 2008-10-24 14:05:46.000000000 +0200
+++ new/yast2-kdump-2.17.9/src/Kdump.ycp 2008-10-31 11:04:38.000000000 +0100
@@ -175,6 +175,14 @@
*/
global string alocated_memory = "0";
+/**
+ * Boolean option indicates that Import()
+ * was called and data was proposed
+ *
+ * boolean true if import was called with data
+ */
+
+global boolean import_called = false;
/**
@@ -212,12 +220,11 @@
"KEXEC_OPTIONS" : "",
"KDUMP_RUNLEVEL" : "1",
"KDUMP_IMMEDIATE_REBOOT" : "yes",
- "KDUMP_COPY_KERNEL" : "no",
+ "KDUMP_COPY_KERNEL" : "yes",
"KDUMP_TRANSFER" : "",
"KDUMP_SAVEDIR" : "file:///var/log/dump",
"KDUMP_KEEP_OLD_DUMPS" : "5",
"KDUMP_FREE_DISK_SIZE" : "64",
- "KDUMP_DUMPDEV" : "",
"KDUMP_VERBOSE" : "3",
"KDUMP_DUMPLEVEL" : "0",
"KDUMP_DUMPFORMAT" : "compressed", //or "ELF"
@@ -537,7 +544,7 @@
} else if (Arch::ia64()) {
y2milestone("ia64 platform without offset");
} else {
- if (!Mode::commandline())
+ if (Mode::normal())
Popup::Error(_("Unsupported architecture, \"crashkernel\" was not added"));
y2error("Unsupported platform/architecture...");
}
@@ -551,6 +558,30 @@
}
+/** bnc #439881 - Don't use extended crashkernel syntax for Xen
+ * Fuction convert extended crashkernel value to old style :Y@X
+ *
+ * @param string - extended value of crashkernel
+ * @return string - old style value
+ */
+
+
+string convertCrashkernelForXEN(string crash)
+{
+ string crash_value = "";
+ if (crash != "")
+ {
+ crash_value = getAlocatedMemory(crash)+"M";
+
+ if ((Arch::i386()) ||(Arch::x86_64()) || Arch::ppc64())
+ crash_value = crash_value + "@16M";
+
+ }
+ y2milestone("Converting crashkernel value from: (%1) to :(%2)",crash, crash_value);
+ return crash_value;
+}
+
+
/**
* Check if default boot section is Xen section
@@ -609,7 +640,7 @@
{
crash = section["xen_append"]:"";
section_pos = section_position;
- }
+ }
});
}
@@ -691,11 +722,20 @@
boolean ProposeAlocatedMemory ()
{
if (alocated_memory == "0")
- {
+ {
if ((total_memory >= 512) && (total_memory/1024) <2)
alocated_memory = "64";
else if ((total_memory/1024) >= 2)
alocated_memory = "128";
+
+ // bnc #431492 - UPT-LTE: /proc/vmcore is empty in kdump kerne
+ if ((Arch::ppc64()) && (alocated_memory != ""))
+ {
+ integer al_mem = tointeger(alocated_memory);
+ al_mem = al_mem *2;
+ alocated_memory = tostring(al_mem);
+ }
+
}
y2milestone("[kdump] allocated memory if not set in \"crashkernel\" param: %1", alocated_memory);
return true;
@@ -772,7 +812,7 @@
debug_KDUMP_SETTINGS["KDUMP_SAVEDIR"] = "********";
debug_KDUMP_SETTINGS["KDUMP_SMTP_PASSWORD"] = "********";
y2milestone("-------------KDUMP_SETTINGS-------------------");
- y2milestone("kdump configuration has been read without value \"KDUMP_SAVEDIR\" and \"KDUMP_SMTP_PASSWORD\": %1", debug_KDUMP_SETTINGS);
+ y2milestone("kdump configuration for writing without value \"KDUMP_SAVEDIR\" and \"KDUMP_SMTP_PASSWORD\": %1", debug_KDUMP_SETTINGS);
y2milestone("---------------------------------------------");
foreach (string option_key, string option_val, KDUMP_SETTINGS, {
@@ -802,21 +842,26 @@
{
Bootloader::Read();
actual_boot_section = Bootloader::getDefaultSection ();
- y2milestone("Default boot section is %1", actual_boot_section);
CheckXenDefault(actual_boot_section);
}
+
+ y2milestone("Default boot section is %1", actual_boot_section);
if (add_crashkernel_param) {
- string crash_value = BuildCrashkernelValue ();
-
+
+ string crash_value = "";
+ if (!Mode::autoinst())
+ crash_value = BuildCrashkernelValue ();
+
if ((!crashkernel_param) || (crash_value != crashkernel_param_value)) {
+ if (Mode::autoinst())
+ crash_value = crashkernel_param_value;
// write crashkernel option to boot section
if (section_pos == -1)
{
result = Bootloader::setKernelParam (actual_boot_section, "crashkernel", crash_value);
} else {
-
- BootCommon::sections[section_pos, "xen_append"]= "crashkernel="+crash_value;
+ BootCommon::sections[section_pos, "xen_append"]= "crashkernel="+convertCrashkernelForXEN(crash_value);
// added flag which means that section was changed bnc #432651
BootCommon::sections[section_pos, "__changed"] = true;
result = true;
@@ -936,7 +981,15 @@
y2milestone("Installation doesn't support kdump.");
return true;
}
+
}
+
+ if ((Mode::installation() || Mode::autoinst()) && (!add_crashkernel_param))
+ {
+ y2milestone("Skip writing of configuration for kdump during installation");
+ return true;
+ }
+
// We do not set help text here, because it was set outside
Progress::New(caption, " ", steps, [
/* Progress stage 1/2 */
@@ -989,7 +1042,7 @@
if (Arch::ppc64())
kdump_packages = add(kdump_packages, "kernel-kdump");
else
- kdump_packages = add(kdump_packages, "kdump");
+ kdump_packages = add(kdump_packages, "kdump");
}
}
@@ -1002,9 +1055,13 @@
{
if (!propose_called)
{
- // set adding boot option...
+ // propose disable kdump if PC has less than 1024MB RAM
+ if (total_memory < 1024)
+ add_crashkernel_param = false;
+ else
+ add_crashkernel_param = true;
+
crashkernel_param = false;
- add_crashkernel_param = true;
// added defualt settings
KDUMP_SETTINGS = DEFAULT_CONFIG;
}
@@ -1056,25 +1113,19 @@
*/
global define void Propose ()
{
-
y2milestone("Proposing new settings of kdump");
-
- // set default values for global variables
- ProposeGlobalVars();
// read available memory
ReadAvailableMemory ();
-
- // propose disable kdump if PC has less than 1024MB RAM
- if (total_memory < 1024)
- add_crashkernel_param = false;
+ // set default values for global variables
+ ProposeGlobalVars();
// add packages for installation
AddPackages();
// select packages for installation
CheckPackages();
-
}
+
/**
* Create a textual summary and a list of unconfigured cards
* @return summary of the current configuration
@@ -1117,6 +1168,7 @@
*/
global define boolean Import (map settings)
{
+ y2milestone("Importing settings for kdump");
crashkernel_param_value = settings["crash_kernel"]:"";
add_crashkernel_param = settings["add_crash_kernel"]:false;
boolean result = true;
@@ -1127,7 +1179,10 @@
string val = (string) my_import_map[str_key]:nil;
if (val != nil) KDUMP_SETTINGS[str_key] = val;
if (val == nil) KDUMP_SETTINGS[str_key] = DEFAULT_CONFIG[str_key]:nil;
- });
+ });
+ if ((haskey(settings, "crash_kernel")) || (haskey(settings, "add_crash_kernel")) ||
+ (size(my_import_map) > 0))
+ import_called = true;
return result;
}
/* EOF */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kdump-2.17.8/src/uifunctions.ycp new/yast2-kdump-2.17.9/src/uifunctions.ycp
--- old/yast2-kdump-2.17.8/src/uifunctions.ycp 2008-10-17 13:55:21.000000000 +0200
+++ new/yast2-kdump-2.17.9/src/uifunctions.ycp 2008-10-29 13:53:57.000000000 +0100
@@ -186,7 +186,6 @@
} else {
Kdump::add_crashkernel_param = false;
}
-
}
/**
@@ -1314,7 +1313,7 @@
*/
void InitEnableCopyKernel (string key) {
- if (Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"]:"false" == "true") {
+ if (Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"]:"no" == "yes") {
UI::ChangeWidget(`id("EnableCopyKernel"), `Value, true);
} else {
UI::ChangeWidget(`id("EnableCopyKernel"), `Value, false);
@@ -1331,9 +1330,9 @@
void StoreEnableCopyKernel (string key, map event) {
boolean value = (boolean) UI::QueryWidget(`id("EnableCopyKernel"), `Value);
if (!value) {
- Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"] = "false";
+ Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"] = "no";
} else {
- Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"] = "true";
+ Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"] = "yes";
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kdump-2.17.8/VERSION new/yast2-kdump-2.17.9/VERSION
--- old/yast2-kdump-2.17.8/VERSION 2008-10-24 14:14:18.000000000 +0200
+++ new/yast2-kdump-2.17.9/VERSION 2008-10-30 15:09:17.000000000 +0100
@@ -1 +1 @@
-2.17.8
+2.17.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org