From 7a5ae9ea5aae514cd88724df64c33f9232b8140a Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Tue, 24 May 2016 09:05:46 +0100
Subject: [PATCH] Update centos7 template to mimic rhels7

---
 .../xcat/install/centos/compute.centos7.tmpl    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl b/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl
index b21d39057..04240e78e 100644
--- a/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl
+++ b/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl
@@ -76,7 +76,12 @@ clearpart --all --initlabel
 # --useLilo
 # --md5pass <crypted MD5 password for GRUB>
 #
-bootloader
+#The bootloader config here is commented out
+#For user customized partition file or partition script,
+#the bootloader configuration should be specified in the user customized partition file/script
+#For the xCAT default partition scheme, the bootloader configuration is in /tmp/partitioning
+#which is generated in %pre section
+##KICKSTARTBOOTLOADER#
 
 #
 # install or upgrade
@@ -147,9 +152,19 @@ reboot
 #INCLUDE_DEFAULT_PKGLIST#
 %end
 %pre
+{
+echo "Running Kickstart Pre-Installation script..."
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh.rhels7#
+} >>/tmp/pre-install.log 2>&1
 %end
 %post
+mkdir -p /var/log/xcat/
+{
+cat >> /var/log/xcat/xcat.log << "EOF"
+%include /tmp/pre-install.log
+EOF
+echo "Running Kickstart Post-Installation script..."
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat#
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels7#
+} >>/var/log/xcat/xcat.log 2>&1
 %end