mcelog support.

diff --git a/root_image/Makefile b/root_image/Makefile
index 1247e61f219a9c9d0539357e47ac528d44898c68..9027a56bd41ae679490d5c662d7596f3b437c95a 100644 (file)
--- 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 bbdbbd5dff861d946c3c33c1cd8dcfc4bf11d48b..2c3a303d1decbf3f57fa1a6d0796717cc05fcd18 100755 (executable)
--- 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')