Mailinglist Archive: yast-commit (459 mails)

[juhliarik@xxxxxxxxxxxxxxxx]

Author: juhliarik
Date: Wed Feb 10 14:16:18 2010
New Revision: 60787

URL: http://svn.opensuse.org/viewcvs/yast?rev=60787&view=rev
Log:
added fix for adding crashkernel to XEN kernel

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/routines/misc.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=60787&r1=60786&r2=60787&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Wed Feb 10 14:16:18 2010
@@ -1 +1 @@
-2.17.67
+2.17.68

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=60787&r1=60786&r2=60787&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 
Wed Feb 10 14:16:18 2010
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Feb 10 13:51:41 CET 2010 - juhliarik@xxxxxxx
+
+- added for for adding crashkernel option to XEN kernel 
+  (bnc#578545)
+- 2.17.68 
+
+-------------------------------------------------------------------
 Mon Jan 11 13:18:28 CET 2010 - juhliarik@xxxxxxx
 
 - added fix for deleting gfxmenu if serial console is used 

Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp?rev=60787&r1=60786&r2=60787&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Wed Feb 
10 14:16:18 2010
@@ -2250,6 +2250,34 @@
        return ret;
 }
 
+/** bnc #578545 - kdump misconfigures crashkernel parameter for Xen
+ * Check if default_append includes crashkernel arg
+ * 
+ * @param string defaul_append
+ * @return string defaul_append without crashkernel
+ */
+
+define string deleteCrashkernelFromAppend (string append)
+{
+       y2milestone("Original append: %1",append);
+       list<string> list_append = splitstring(append, " ");
+
+       if (size(list_append)>0)
+       {
+          list_append = filter(string key, list_append,
+          {
+               if (search(key, "crashkernel") == nil)
+                   return true;
+               else
+                   return false;
+           });
+       }
+       string ret = mergestring(list_append, " ");
+       y2milestone("Filtered append: %1",ret);
+       return ret;
+}
+
+
 /** FATE #302245 save kernel args etc to /etc/sysconfig/bootloader
  * Function write/update info in /etc/sysconfig/bootloader
  * @param booloean true if it called from inst_bootloader.ycp 
@@ -2386,7 +2414,7 @@
 
     if (! xen_set)
     {
-       xen_kernel_append = default_append;
+       xen_kernel_append = deleteCrashkernelFromAppend(default_append);
        xen_append = "";
        xen_vga = default_vga;
     }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx