From 38343be0fad04801383d3e130a31e257d429185c Mon Sep 17 00:00:00 2001
From: Joern Siglen <siglen@de.ibm.com>
Date: Wed, 1 Sep 2021 16:02:09 +0200
Subject: [PATCH] dbginfo.sh: update the order of collection steps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We found situations, where the debug commands from dbginfo.sh
did overwrite some debug files (e.g. OSA s390dbf) - so we change
the collection order

Signed-off-by: Joern Siglen <siglen@de.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 scripts/dbginfo.sh   |  7 ++++---
 scripts/dbginfo.sh.1 | 14 +++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh
index ad04dbef..4836a671 100755
--- a/scripts/dbginfo.sh
+++ b/scripts/dbginfo.sh
@@ -251,13 +251,14 @@ readonly OUTPUT_FILE_OSAOAT="${WORKPATH}network"
 readonly OUTPUT_FILE_SYSFS="${WORKPATH}sysfs"
 
 # define order of collection steps
+# - state/debug files are collected first, to avoid overwriting by command execution
 ALL_STEPS="\
+ collect_sysfs\
+ collect_procfs\
+ collect_configfiles\
  collect_cmdsout\
  collect_hyptop\
  collect_vmcmdsout\
- collect_procfs\
- collect_sysfs\
- collect_configfiles\
  collect_network\
  collect_osaoat\
  collect_ethtool\
diff --git a/scripts/dbginfo.sh.1 b/scripts/dbginfo.sh.1
index 05f11ae3..ece4e2af 100644
--- a/scripts/dbginfo.sh.1
+++ b/scripts/dbginfo.sh.1
@@ -1,4 +1,4 @@
-.TH DBGINFO.SH  1 "April 2021" "s390-tools"
+.TH DBGINFO.SH  1 "September 2021" "s390-tools"
 
 .SH NAME
 dbginfo.sh \- collect runtime, configuration and trace information
@@ -71,17 +71,17 @@ OS version / distro   = Red Hat Enterprise Linux 8.4 (Ootpa)
 .br
 Date and time of info = 2021-08-26-15-27-58
 .PP
-1 of 18: Collecting command output
+1 of 18: Collecting sysfs
 .PP
-2 of 18: Collecting hyptop for z/VM - 5s output
+2 of 18: Collecting procfs
 .PP
-3 of 18: Collecting z/VM output
+3 of 18: Collecting config files
 .PP
-4 of 18: Collecting procfs
+4 of 18: Collecting command output
 .PP
-5 of 18: Collecting sysfs
+5 of 18: Collecting hyptop for z/VM - 5s output
 .PP
-6 of 18: Collecting config files
+6 of 18: Collecting z/VM output
 .PP
 7 of 18: Collecting network output
 .PP