From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 13 Jan 2011 18:07:44 +0000 (-0500)
Subject: mcelog support.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=61b5dd3d64480900f95789835fd27cdce4c4ec67;p=xentesttools%2Fbootstrap.git

mcelog support.
---

diff --git a/root_image/Makefile b/root_image/Makefile
index 1247e61..9027a56 100644
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -350,6 +350,9 @@ add-bins: userspace-prep
 	$(call RPM_TO_USERSPACE,./usr/sbin/lsof,$(RPM_DIR)/lsof)
 	$(call RPM_TO_USERSPACE,./sbin/dhclient*,$(RPM_DIR)/dhclient)
 	$(call RPM_TO_USERSPACE,./usr/bin/idn,$(RPM_DIR)/libidn)
+ifeq ($(RPM_ARCH), x86_64)
+	$(call RPM_TO_USERSPACE,./usr/sbin/mcelog,$(RPM_DIR)/mcelog)
+endif
 
 .PHONY:	add-debug-bins
 add-debug-bins: root_image-tools-install 
diff --git a/root_image/etc/init.d/rcS b/root_image/etc/init.d/rcS
index bbdbbd5..2c3a303 100755
--- a/root_image/etc/init.d/rcS
+++ b/root_image/etc/init.d/rcS
@@ -53,6 +53,10 @@ if [ $? == 1 ]; then
 	rmmod dump_dma
 fi
 
+if [ `uname -m` == "x86_64" ]; then
+	/usr/sbin/mcelog --daemon
+fi
+
 /etc/init.d/primary_fb stop
 
 NOIBFT=$(boot_parameter 'noibft')