From e0fab6d9c4de2f26470cca9b9ce06ca18e86cfc0 Mon Sep 17 00:00:00 2001
From: penguhyang <ypbj@cn.ibm.com>
Date: Mon, 19 Oct 2015 05:07:42 -0400
Subject: [PATCH] check the postscripts before running it with 'bash -x'
 upgrade

---
 xCAT-server/share/xcat/install/scripts/post.ubuntu | 3 +++
 xCAT-server/share/xcat/install/scripts/post.xcat   | 3 +++
 xCAT/postscripts/xcatdsklspost                     | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/xCAT-server/share/xcat/install/scripts/post.ubuntu b/xCAT-server/share/xcat/install/scripts/post.ubuntu
index 01b35b9e4..26d062e8b 100755
--- a/xCAT-server/share/xcat/install/scripts/post.ubuntu
+++ b/xCAT-server/share/xcat/install/scripts/post.ubuntu
@@ -164,6 +164,9 @@ run_ps () {
      if [[ \"\$compt\" =~ \$reg ]]; then
         bash -x ./\$@ 2>&1 | tee -a \$logfile
         ret_local=\${PIPESTATUS[0]}
+     else
+        ./\$@ 2>&1 | tee -a \$logfile
+        ret_local=\${PIPESTATUS[0]}
      fi
   else
      ./\$@ 2>&1 | tee -a \$logfile
diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat b/xCAT-server/share/xcat/install/scripts/post.xcat
index 7c1719200..0ad6ce8e6 100755
--- a/xCAT-server/share/xcat/install/scripts/post.xcat
+++ b/xCAT-server/share/xcat/install/scripts/post.xcat
@@ -149,6 +149,9 @@ run_ps () {
      if [[ \"\$compt\" =~ \$reg ]]; then
         bash -x ./\$@ 2>&1 | tee -a \$logfile
         ret_local=\${PIPESTATUS[0]}
+     else
+        ./\$@ 2>&1 | tee -a \$logfile
+        ret_local=\${PIPESTATUS[0]}
      fi
   else
      ./\$@ 2>&1 | tee -a \$logfile
diff --git a/xCAT/postscripts/xcatdsklspost b/xCAT/postscripts/xcatdsklspost
index cf86c2e03..feec383a4 100755
--- a/xCAT/postscripts/xcatdsklspost
+++ b/xCAT/postscripts/xcatdsklspost
@@ -834,6 +834,9 @@ run_ps () {
      if [[ \"\$compt\" =~ \$reg ]]; then
         bash -x ./\$@ 2>&1 | tee -a \$logfile
         ret_local=\${PIPESTATUS[0]}
+     else
+        ./\$@ 2>&1 | tee -a \$logfile
+        ret_local=\${PIPESTATUS[0]}
      fi
   else
      ./\$@ 2>&1 | tee -a \$logfile