From 5f9562f33ecb27ec8e309e54146a084b82d1dd19 Mon Sep 17 00:00:00 2001
From: penguhyang <ypbj@cn.ibm.com>
Date: Wed, 23 Mar 2016 04:24:35 -0400
Subject: [PATCH] turn off logging every single line of a shell script

---
 xCAT-server/share/xcat/install/scripts/chroot.sles   | 12 +++++++++++-
 .../share/xcat/install/scripts/post.sles.common      |  8 +++++++-
 xCAT-server/share/xcat/install/scripts/post.sles11   |  1 +
 xCAT-server/share/xcat/install/scripts/pre.sles      | 12 +++++++++++-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/share/xcat/install/scripts/chroot.sles b/xCAT-server/share/xcat/install/scripts/chroot.sles
index a1d14ce09..f7cb762cb 100644
--- a/xCAT-server/share/xcat/install/scripts/chroot.sles
+++ b/xCAT-server/share/xcat/install/scripts/chroot.sles
@@ -2,9 +2,12 @@
         <script>
           <filename>boot.sh</filename>
           <interpreter>shell</interpreter>
+          <debug config:type="boolean">false</debug>
           <source>
 
 <![CDATA[
+#!/bin/sh
+
 mkdir -p /mnt/var/log/xcat/
 {
 
@@ -12,7 +15,10 @@ cat /tmp/pre-install.log >> /mnt/var/log/xcat/xcat.log
 
 echo "Running AutoYaST Chroot-Installation script..."
 
-#!/bin/sh
+export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#"
+if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then
+    set -x
+fi
 
 AWK=`find / -name awk | head -1`
 #old awk /mounts/instsys/bin/awk -f
@@ -76,6 +82,10 @@ elif [[ `echo "$PRINIC" | grep -sqE ^[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-F
     export PRINIC=`ip -o link|grep -i "$PRINIC"|awk  '{print $2}'|sed s/://`
 fi
 echo 'export PRINIC='"$PRINIC" > /mnt/tmp/prinicsetting
+
+if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then
+    set +x
+fi
 } >>/mnt/var/log/xcat/xcat.log 2>&1
 ]]>
 
diff --git a/xCAT-server/share/xcat/install/scripts/post.sles.common b/xCAT-server/share/xcat/install/scripts/post.sles.common
index a356df5dc..be6ad228c 100755
--- a/xCAT-server/share/xcat/install/scripts/post.sles.common
+++ b/xCAT-server/share/xcat/install/scripts/post.sles.common
@@ -1,10 +1,13 @@
 #!/bin/sh
 
-
 export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#"
 export MASTER_IP="#ENV:MASTER_IP#"
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/scriptlib#
 
+if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then
+    set -x
+fi
+
 export MANAGEDADDRESSMODE=#MANAGEDADDRESSMODE#
 
 cd /etc/sysconfig/network
@@ -63,3 +66,6 @@ if [ "$XCATDEBUGMODE" != "0" ]; then
 fi
 /sbin/portmap
 
+if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then
+    set +x
+fi
diff --git a/xCAT-server/share/xcat/install/scripts/post.sles11 b/xCAT-server/share/xcat/install/scripts/post.sles11
index a412fb6dc..2eba0eae3 100644
--- a/xCAT-server/share/xcat/install/scripts/post.sles11
+++ b/xCAT-server/share/xcat/install/scripts/post.sles11
@@ -2,6 +2,7 @@
         <script>
           <filename>xcat.sh</filename>
           <interpreter>shell</interpreter>
+          <debug config:type="boolean">false</debug>
           <source>
 
 <![CDATA[
diff --git a/xCAT-server/share/xcat/install/scripts/pre.sles b/xCAT-server/share/xcat/install/scripts/pre.sles
index b7c7ab29f..f42cabf40 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.sles
+++ b/xCAT-server/share/xcat/install/scripts/pre.sles
@@ -2,13 +2,19 @@
         <script>
           <filename>foo.sh</filename>
           <interpreter>shell</interpreter>
+          <debug config:type="boolean">false</debug>
           <source>
 
 <![CDATA[
+#!/bin/sh
+
 {
 echo "Running AutoYaST Pre-Installation script..."
 
-#!/bin/sh
+export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#"
+if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then
+    set -x
+fi
 
 AWK=`find / -name awk | tail -1`
 #old awk /mounts/instsys/bin/awk -f
@@ -163,6 +169,10 @@ fi
 export nextserver=`cat /proc/cmdline | grep http | awk -F'autoyast=http://' {'print \$2'} | awk -F':' {'print \$1'}`
 cp /tmp/profile/modified.xml /tmp/profile/modified1.xml
 sed -e 's!<software>!<add-on><add_on_products config:type="list">#INSTALL_SOURCES_IN_PRE#</add_on_products></add-on><software>!'  /tmp/profile/modified1.xml > /tmp/profile/modified.xml
+
+if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then
+    set +x
+fi
 } >>/tmp/pre-install.log 2>&1
 ]]>