From 51c31dbf52486590322294d92daab896fa15035e Mon Sep 17 00:00:00 2001
From: Dave Young <dyoung@redhat.com>
Date: Aug 31 2012 02:10:58 +0000
Subject: firstboot: add actual reserved memory widget


Memory reservation could fail, so add a new widget to show the
actual reserved size. If crashkernel is set but reserved size is
0, we still regard kdump is enabled, the actual reserved widget
just show the reservation status.

vivek: label with text "Memory Currently Reserved"

Signed-off-by: Dave Young <dyoung@redhat.com>
Reviewed-by: Vivek Goyal <vgoyal@redhat.com>

---

diff --git a/firstboot_kdump.py b/firstboot_kdump.py
index 8eb4f43..ad80b44 100755
--- a/firstboot_kdump.py
+++ b/firstboot_kdump.py
@@ -77,6 +77,8 @@ class moduleClass(Module):
 		self.labelTotal.set_sensitive(status)
 		self.labelKdump.set_sensitive(status)
 		self.labelSys.set_sensitive(status)
+		self.labelReserved.set_sensitive(status)
+		self.labelReservedMemsize.set_sensitive(status)
 		self.kdumpEnabled = status
 		self.AdvWindow.set_sensitive(status)
 
@@ -228,6 +230,10 @@ class moduleClass(Module):
 		self.labelSys.set_mnemonic_widget(self.systemUsableMem)
 		self.labelSys.set_alignment(0.0, 0.5)
 
+		self.labelReserved=gtk.Label(_("Memory Currently Reserved (MB):"))
+		self.labelReservedMemsize=gtk.Label(_("%s" % self.reservedMem))
+		self.labelReserved.set_alignment(0.0, 0.5)
+
 		# Add an advanced kdump config text widget
 		inputbuf = open("/etc/kdump.conf", "r")
 		self.AdvConfig = gtk.TextView()
@@ -275,11 +281,14 @@ class moduleClass(Module):
 		table.attach(self.labelKdump, 0, 1, 2, 3, gtk.FILL)
 		table.attach(self.kdumpMemspin, 1, 2, 2, 3, gtk.SHRINK, gtk.FILL, 5, 5)
 
-		table.attach(self.labelSys, 0, 1, 3, 4, gtk.FILL)
-		table.attach(self.systemUsableMem, 1, 2, 3, 4, gtk.SHRINK, gtk.FILL, 5, 5)
+		table.attach(self.labelReserved, 0, 1, 3, 4, gtk.FILL)
+		table.attach(self.labelReservedMemsize, 1, 2, 3, 4, gtk.SHRINK, gtk.FILL, 5, 5)
+
+		table.attach(self.labelSys, 0, 1, 4, 5, gtk.FILL)
+		table.attach(self.systemUsableMem, 1, 2, 4, 5, gtk.SHRINK, gtk.FILL, 5, 5)
 
-		table.attach(self.AdvConfLabel, 0, 1, 5, 6, gtk.FILL)
-		table.attach(self.AdvWindow, 0, 2, 6, 100, gtk.FILL, gtk.FILL, 5, 5)
+		table.attach(self.AdvConfLabel, 0, 1, 6, 7, gtk.FILL)
+		table.attach(self.AdvWindow, 0, 2, 7, 100, gtk.FILL, gtk.FILL, 5, 5)
 
 		# disable until user clicks check box, if not already enabled
 		if self.initialState is False: