rpms/kexec-tools/F-12 firstboot_kdump.py, 1.2, 1.3 kexec-tools.spec, 1.153, 1.154
Neil Horman
nhorman at fedoraproject.org
Mon Nov 23 16:20:14 UTC 2009
Author: nhorman
Update of /cvs/extras/rpms/kexec-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9433
Modified Files:
firstboot_kdump.py kexec-tools.spec
Log Message:
Resolves: bz 539812
Index: firstboot_kdump.py
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-12/firstboot_kdump.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- firstboot_kdump.py 23 Jun 2009 18:36:27 -0000 1.2
+++ firstboot_kdump.py 23 Nov 2009 16:20:14 -0000 1.3
@@ -48,12 +48,13 @@ class moduleClass(Module):
self.priority = 100
self.sidebarTitle = N_("Kdump")
self.title = N_("Kdump")
+ self.reboot = False
# runPriority determines the order in which this module runs in firstboot
runPriority = 70
moduleName = _("Kdump")
windowName = moduleName
- needsReboot = False
+ reboot = False
# possible bootloaders we'll need to adjust
# bootloader : (config file, kdump offset)
@@ -70,6 +71,9 @@ class moduleClass(Module):
kernelKdumpArches = [ "ppc64" ]
kernelKdumpInstalled = False
+ def needsReboot(self):
+ return self.reboot
+
# toggle sensitivity of kdump config bits
def showHide(self, status):
self.totalMem.set_sensitive(status)
@@ -139,6 +143,7 @@ class moduleClass(Module):
self.kdumpMem = 0
self.kdumpOffset = 0
self.origCrashKernel = ""
+ self.kdumpEnabled = False
chkConfigStatus=commands.getoutput('/sbin/chkconfig --list kdump')
if chkConfigStatus.find("on") > -1:
self.kdumpEnabled = True
@@ -148,13 +153,16 @@ class moduleClass(Module):
cmdLine.split())[0].split("=")[1]
if self.doDebug:
print "crashString is %s" % crashString
- (self.kdumpMem, self.kdumpOffset) = [int(m[:-1]) for m in crashString.split("@")]
+ if crashString.find("@") != -1:
+ (self.kdumpMem, self.kdumpOffset) = [int(m[:-1]) for m in crashString.split("@")]
+ else:
+ self.kdumpMem = int(crashString[:-1])
+ self.kdumpOffset = 0
self.availMem += self.kdumpMem
- self.origCrashKernel = "%dM@%dM" % (self.kdumpMem, self.kdumpOffset)
+ self.origCrashKernel = "%dM" % (self.kdumpMem)
self.kdumpMemInitial = self.kdumpMem
else:
self.kdumpEnabled = False
- self.kdumpMemInitial = 0
self.initialState = self.kdumpEnabled
# Do some sanity-checking and try to present only sane options.
@@ -325,10 +333,10 @@ class moduleClass(Module):
dlg.destroy()
if rc == gtk.RESPONSE_NO:
- self.needsReboot = False
+ self.reboot = False
return RESULT_SUCCESS
else:
- self.needsReboot = True
+ self.reboot = True
# Find bootloader if it exists, and update accordingly
if self.getBootloader() == None:
@@ -341,8 +349,8 @@ class moduleClass(Module):
# Are we adding or removing the crashkernel param?
if self.kdumpEnabled:
- grubbyCmd = "/sbin/grubby --%s --update-kernel=/boot/vmlinuz-%s --args=crashkernel=%iM@%iM" \
- % (self.bootloader, self.runningKernel, reservedMem, self.offset)
+ grubbyCmd = "/sbin/grubby --%s --update-kernel=/boot/vmlinuz-%s --args=crashkernel=%iM" \
+ % (self.bootloader, self.runningKernel, reservedMem)
chkconfigStatus = "on"
else:
grubbyCmd = "/sbin/grubby --%s --update-kernel=/boot/vmlinuz-%s --remove-args=crashkernel=%s" \
@@ -358,7 +366,7 @@ class moduleClass(Module):
if self.bootloader == 'yaboot':
os.system('/sbin/ybin')
else:
- self.needsReboot = False
+ self.reboot = False
return RESULT_SUCCESS
Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-12/kexec-tools.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- kexec-tools.spec 15 Sep 2009 17:05:00 -0000 1.153
+++ kexec-tools.spec 23 Nov 2009 16:20:14 -0000 1.154
@@ -1,6 +1,6 @@
Name: kexec-tools
Version: 2.0.0
-Release: 27%{?dist}
+Release: 28%{?dist}
License: GPLv2
Group: Applications/System
Summary: The kexec/kdump userspace component.
@@ -264,6 +264,9 @@ done
%changelog
+* Mon Nov 23 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-28
+- Update firstboot_kdump.py to rawhide version (bz 539812)
+
* Tue Sep 15 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-27
- Fixing permissions on dracut module files
More information about the scm-commits
mailing list