From a0d6edf03c255ca2f906c4eb98398e8fcf03f0b8 Mon Sep 17 00:00:00 2001
From: Joern Siglen <siglen@de.ibm.com>
Date: Mon, 14 Feb 2022 12:06:33 +0100
Subject: [PATCH] dbginfo.sh: (re)group commands by long output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change will group the commands with long output into two
sections with a comment.
By grouping, we intend to enhance the handling in our runtime.out file
and help to understand the purpose of command groups.

We did get feedback for moveing some independent long output files to
the end for speed up the scrolling in the upper parts.
Files which already have a separate output file are bundled in a
separate group at the end.

Signed-off-by: Joern Siglen <siglen@de.ibm.com>
Reviewed-by: Sa Liu <saliu@de.ibm.com>
Reviewed-by: Mario Held <mario.held@de.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 scripts/dbginfo.sh | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh
index 7a3728e8..521e364d 100755
--- a/scripts/dbginfo.sh
+++ b/scripts/dbginfo.sh
@@ -418,7 +418,6 @@ CMDS="uname -a\
   :env\
   :df -h\
   :df -i\
-  :dmesg -s 1048576\
   :dmsetup ls\
   :dmsetup ls --tree\
   :dmsetup table\
@@ -461,22 +460,13 @@ CMDS="uname -a\
   :multipath -d\
   :multipath -t\
   :pkcsconf -mlist\
-  :ps -emo pid,tid,nlwp,policy,user,tname,ni,pri,psr,sgi_p,stat,wchan,start_time,time,pcpu,pmem,vsize,size,rss,share,command\
-  :ps -eHo pid,tid,nlwp,policy,user,tname,ni,pri,psr,sgi_p,stat,wchan,start_time,time,pcpu,pmem,vsize,size,rss,share,command\
-  :ps axX\
   :pvpath -qa\
   :SPident # SLES service package\
   :cat /var/lib/opencryptoki/pk_config_data\
   :ls -al /usr/lib64/opencryptoki/stdll\
-  :rpm -qa | sort >> '${OUTPUT_FILE_ISW}'\
-  :apt list >> '${OUTPUT_FILE_ISW}'\
-  :lsof >> '${OUTPUT_FILE_LSOF}'\
   :find /boot -print0 | sort -z | xargs -0 -n 10 ls -ld\
   :find /dev -print0 | sort -z | xargs -0 -n 10 ls -ld\
   :find /var/crash -print0 | sort -z | xargs -0 -n 10 ls -ld\
-  :cat /root/.bash_history\
-  :journalctl --all --no-pager --lines=100000 --output=short-precise\
-   >> '${OUTPUT_FILE_JOURNALCTL}'\
   :smc_dbg\
   :sysctl -a\
   :systemctl --all --no-pager show\
@@ -484,10 +474,28 @@ CMDS="uname -a\
   :systemctl --all --no-pager list-unit-files\
   :systemd-delta\
   :lvdisplay\
-  :coredumpctl && coredumpctl info -o ${OUTPUT_FILE_COREDUMPCTL}\
   :ziorep_config -ADM\
   "
 
+# commands with long output at the end
+CMDS="${CMDS}\
+  :cat /root/.bash_history\
+  :dmesg -s 1048576\
+  :ps -emo pid,tid,nlwp,policy,user,tname,ni,pri,psr,sgi_p,stat,wchan,start_time,time,pcpu,pmem,vsize,size,rss,share,command\
+  :ps -eHo pid,tid,nlwp,policy,user,tname,ni,pri,psr,sgi_p,stat,wchan,start_time,time,pcpu,pmem,vsize,size,rss,share,command\
+  :ps axX\
+  "
+
+# commands with separate output file
+CMDS="${CMDS}\
+  :apt list >> '${OUTPUT_FILE_ISW}'\
+  :coredumpctl && coredumpctl info -o ${OUTPUT_FILE_COREDUMPCTL}\
+  :journalctl --all --no-pager --lines=100000 --output=short-precise\
+   >> '${OUTPUT_FILE_JOURNALCTL}'\
+  :lsof >> '${OUTPUT_FILE_LSOF}'\
+  :rpm -qa | sort >> '${OUTPUT_FILE_ISW}'\
+  "
+
 ########################################
 # network comamnds for separate output file with ip -br a as header command
 NETWORK_CMDS="ip -br a\