diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh b/xCAT-server/share/xcat/install/scripts/pre.rh
index 1254652d0..5eb3e8a77 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.rh
+++ b/xCAT-server/share/xcat/install/scripts/pre.rh
@@ -1,3 +1,9 @@
+export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#"
+if [ "$XCATDEBUGMODE" != "0" ] && [ "$XCATDEBUGMODE" != "" ]
+then
+    set -x
+fi
+
 if grep n8r /proc/cmdline > /dev/null 2>&1;
 then
   stty crtscts
@@ -266,4 +272,7 @@ NEXTSERVER=${NEXTSERVER%%:*}
 export nextserver=$NEXTSERVER
 #INSTALL_SOURCES_IN_PRE#
 
-
+if [ "$XCATDEBUGMODE" != "0" ] && [ "$XCATDEBUGMODE" != "" ]
+then
+    set +x
+fi
diff --git a/xCAT-server/share/xcat/install/ubuntu/compute.tmpl b/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
index 4e9b1ada5..2c8b7f5ca 100644
--- a/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
+++ b/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
@@ -51,8 +51,10 @@ d-i partman-md/device_remove_md boolean true
 
 #create the /tmp/partitionfile based on the uefi or legacy bios 
 d-i partman/early_command string \
+{ \
 #INCLUDE_GET_FIRST_DISK_SCRIPT#  \
-    debconf-set partman-auto/disk "$(cat /tmp/install_disk)"
+    debconf-set partman-auto/disk "$(cat /tmp/install_disk)"; \
+} >>/tmp/pre-install.log 2>&1
 d-i partman-auto/expert_recipe_file string /tmp/partitionfile
 
 # This makes partman automatically partition without confirmation, provided