From a91a599b1974a4d84a02615876c9b608ca152464 Mon Sep 17 00:00:00 2001
From: Vivek Reddy Karri <vkarri@nvidia.com>
Date: Sat, 16 Oct 2021 21:49:10 +0000
Subject: [PATCH] Removed -t option and other missing fixes

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
---
 scripts/generate_dump | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/generate_dump b/scripts/generate_dump
index 486bcbccf9..7331ba942d 100755
--- a/scripts/generate_dump
+++ b/scripts/generate_dump
@@ -663,11 +663,11 @@ save_redis() {
 save_saidump() {
     trap 'handle_error $? $LINENO' ERR
     if [[ ( "$NUM_ASICS" == 1 ) ]] ; then
-        save_cmd "docker exec -t syncd saidump" "saidump"
+        save_cmd "docker exec syncd saidump" "saidump"
     else
         for (( i=0; i<$NUM_ASICS; i++ ))
         do
-            save_cmd "docker exec -t syncd$i saidump" "saidump$i"
+            save_cmd "docker exec syncd$i saidump" "saidump$i"
         done
     fi
 }
@@ -808,8 +808,8 @@ collect_mellanox() {
     local sai_dump_folder="/tmp/saisdkdump"
     local sai_dump_filename="${sai_dump_folder}/sai_sdk_dump_$(date +"%m_%d_%Y_%I_%M_%p")"
 
-    ${CMD_PREFIX}docker exec -t syncd mkdir -p $sai_dump_folder
-    ${CMD_PREFIX}docker exec -t syncd saisdkdump -f $sai_dump_filename
+    ${CMD_PREFIX}docker exec syncd mkdir -p $sai_dump_folder
+    ${CMD_PREFIX}docker exec syncd saisdkdump -f $sai_dump_filename
 
     copy_from_docker syncd $sai_dump_folder $sai_dump_folder
     echo "$sai_dump_folder"
@@ -818,7 +818,7 @@ collect_mellanox() {
     done
 
     ${CMD_PREFIX}rm -rf $sai_dump_folder
-    ${CMD_PREFIX}docker exec -t syncd rm -rf $sai_dump_folder
+    ${CMD_PREFIX}docker exec syncd rm -rf $sai_dump_folder
     
     # Save SDK error dumps
     local sdk_dump_path=`${CMD_PREFIX}docker exec syncd cat /tmp/sai.profile|grep "SAI_DUMP_STORE_PATH"|cut -d = -f2`
@@ -1195,12 +1195,12 @@ main() {
     if [[ ( "$NUM_ASICS" > 1 ) ]]; then
         for (( i=0; i<$NUM_ASICS; i++ ))
         do
-            save_cmd "docker exec -t lldp$i lldpcli show statistics" "lldp$i.statistics"
+            save_cmd "docker exec lldp$i lldpcli show statistics" "lldp$i.statistics"
             save_cmd "docker logs bgp$i" "docker.bgp$i.log"
             save_cmd "docker logs swss$i" "docker.swss$i.log"
         done
     else
-        save_cmd "docker exec -t lldp lldpcli show statistics" "lldp.statistics"
+        save_cmd "docker exec lldp lldpcli show statistics" "lldp.statistics"
         save_cmd "docker logs bgp" "docker.bgp.log"
         save_cmd "docker logs swss" "docker.swss.log"
     fi
@@ -1307,7 +1307,11 @@ main() {
     fi
 
     echo ${TARFILE}
-    exit $RETURN_CODE
+    
+    if ! $SAVE_STDERR
+    then
+    	exit $RETURN_CODE
+    fi
 }
 
 ###############################################################################