From 7a278a9a6b192e5c72568298845866aaa0a4c376 Mon Sep 17 00:00:00 2001
From: mihirpat1 <112018033+mihirpat1@users.noreply.github.com>
Date: Thu, 14 Sep 2023 12:41:33 -0700
Subject: [PATCH 1/2] Include /var/log.tmpfs in techsupport (#2979)

Signed-off-by: Mihir Patel <patelmi@microsoft.com>
---
 scripts/generate_dump | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/scripts/generate_dump b/scripts/generate_dump
index dcfa94b55d..c2c6b57531 100755
--- a/scripts/generate_dump
+++ b/scripts/generate_dump
@@ -981,8 +981,26 @@ save_log_files() {
     trap enable_logrotate HUP INT QUIT TERM KILL ABRT ALRM
 
     start_t=$(date +%s%3N)
+    log_dir_1="/var/log/"
+    log_dir_2="/var/log.tmpfs/"
+    file_list=""
+
+    if [ -d "$log_dir_1" ]; then
+        file_list_1=$(find_files ${log_dir_1})
+        file_list="${file_list} ${file_list_1}"
+    fi
+
+    if [ -d "$log_dir_2" ]; then
+        file_list_2=$(find_files ${log_dir_2})
+        file_list="${file_list} ${file_list_2}"
+    fi
+
     # gzip up all log files individually before placing them in the incremental tarball
-    for file in $(find_files "/var/log/"); do
+    for file in $file_list; do
+        dest_dir="log"
+        if [[ $file == *"tmpfs"* ]]; then
+            dest_dir="log.tmpfs"
+        fi
         # ignore the sparse file lastlog
         if [ "$file" = "/var/log/lastlog" ]; then
             continue
@@ -990,9 +1008,9 @@ save_log_files() {
         # don't gzip already-gzipped log files :)
         # do not append the individual files to the main tarball
         if [ -z "${file##*.gz}" ]; then
-            save_file $file log false false
+            save_file $file $dest_dir false false
         else
-            save_file $file log true false
+            save_file $file $dest_dir true false
         fi
     done
 

From 861bf883886dc94273d321d6b0f904323011ba07 Mon Sep 17 00:00:00 2001
From: Mihir Patel <patelmi@microsoft.com>
Date: Thu, 21 Sep 2023 18:53:47 +0000
Subject: [PATCH 2/2] Added code to include log.tmpfs in tar file

---
 scripts/generate_dump | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/scripts/generate_dump b/scripts/generate_dump
index c2c6b57531..c3ea73d217 100755
--- a/scripts/generate_dump
+++ b/scripts/generate_dump
@@ -1015,11 +1015,19 @@ save_log_files() {
     done
 
     # Append the log folder to the main tarball
-    ($TAR $V -rhf $TARFILE -C $DUMPDIR ${BASE}/log \
-        || abort "${ERROR_TAR_FAILED}" "tar append operation failed. Aborting for safety") \
-        && $RM $V -rf $TARDIR/log
+    if [ -d "$log_dir_1" ]; then
+        ($TAR $V -rhf $TARFILE -C $DUMPDIR ${BASE}/log \
+            || abort "${ERROR_TAR_FAILED}" "tar append operation failed. Aborting for safety") \
+            && $RM $V -rf $TARDIR/log
+    fi
+    if [ -d "$log_dir_2" ]; then
+        # Append the log.tmpfs folder to the main tarball
+        ($TAR $V -rhf $TARFILE -C $DUMPDIR ${BASE}/log.tmpfs \
+            || abort "${ERROR_TAR_FAILED}" "tar append operation failed. Aborting for safety") \
+            && $RM $V -rf $TARDIR/log.tmpfs
+    fi
     end_t=$(date +%s%3N)
-    echo "[ TAR /var/log Files ] : $(($end_t-$start_t)) msec" >> $TECHSUPPORT_TIME_INFO
+    echo "[ TAR /var/log and /var/log.tmpfs Files ] : $(($end_t-$start_t)) msec" >> $TECHSUPPORT_TIME_INFO
 
     enable_logrotate
 }