rpms/system-config-kdump/devel system-config-kdump-1.0.14-ommit-offset.patch, NONE, 1.1

[Roman Rakus]

Author: rrakus

Update of /cvs/extras/rpms/system-config-kdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9946

Added Files:
	system-config-kdump-1.0.14-ommit-offset.patch 
Log Message:
added missing patch

system-config-kdump-1.0.14-ommit-offset.patch:

--- NEW FILE system-config-kdump-1.0.14-ommit-offset.patch ---
diff -up system-config-kdump-1.0.14/src/system-config-kdump.py.ommit-offset system-config-kdump-1.0.14/src/system-config-kdump.py
--- system-config-kdump-1.0.14/src/system-config-kdump.py.ommit-offset	2008-09-11 14:10:29.000000000 +0200
+++ system-config-kdump-1.0.14/src/system-config-kdump.py	2008-09-11 14:14:30.000000000 +0200
@@ -183,8 +183,10 @@ class mainWindow:
             if cmdLine.find("crashkernel=") > -1:
                 crashString = filter(lambda t: t.startswith("crashkernel="), 
                                      cmdLine.split())[0].split("=")[1]
-                (kdumpMem, kdumpOffset) = \
-                           [int(m[:-1]) for m in crashString.split("@")]
+                tokens = crashString.split("@")
+                kdumpMem = int(tokens[0][:-1])
+                if len(tokens) == 2:
+                    kdumpOffset = int(tokens[1][:-1])
 
         # i686 xen requires kernel-PAE for kdump if any memory
         # is mapped above 4GB
@@ -208,8 +210,10 @@ class mainWindow:
 			line = line.replace('"', '')
 			crashString = filter(lambda t: t.startswith("crashkernel="),
 					     line.split())[0].split("=")[1]
-			(kdumpMemGrubby, kdumpOffsetGrubby) = \
-				[int(m[:-1]) for m in crashString.split("@")]
+                        tokens = crashString.split("@")
+                        kdumpMemGrubby = int(tokens[0][:-1])
+                        if len(tokens) == 2:
+                            kdumpOffsetGrubby = int(tokens[2][:-1])
 			if debug:
 				print "grubby --info: crashkernel=%iM@%iM" \
 					% (kdumpMemGrubby, kdumpOffsetGrubby)
@@ -235,7 +239,10 @@ class mainWindow:
             self.kdumpEnabled = True
             self.kdumpEnableCheckButton.set_active(True)
             totalMem += kdumpMem
-            self.origCrashKernel = "%dM@%dM" % (kdumpMem, kdumpOffset)
+            if kdumpOffset == 0:
+                self.origCrashKernel = "%dM" % (kdumpMem)
+            else:
+                self.origCrashKernel = "%dM@%dM" % (kdumpMem, kdumpOffset)
         else:
 	    self.kdumpMem = kdumpMemGrubby = lowerBound
             self.kdumpEnableCheckButton.set_active(False)
@@ -709,7 +716,7 @@ class mainWindow:
 
         # Are we adding or removing the crashkernel param?
         if self.kdumpEnabled:
-            crashKernel = "%iM@%iM" % (self.kdumpMem, offset)
+            crashKernel = "%iM" % (self.kdumpMem)
             grubbyCmd = '/sbin/grubby --%s --update-kernel=%s --%s="crashkernel=%s"' \
                         % (self.bootloader, self.defKern, 
                            args, crashKernel)
@@ -726,7 +733,7 @@ class mainWindow:
             serviceOp = "stop"
 
         if debug:
-            print "Using %s bootloader with %iM offset" % (self.bootloader, offset)
+            print "Using %s bootloader without offset" % (self.bootloader)
             print "Grubby command:\n    %s" % grubbyCmd
 
         # FIXME: use rhpl.executil (and handle errors)!