File s390-tools-sles15sp3-07-dbginfo.sh-addtional-timeout-and-omitting-a-report.patch of Package s390-tools.25302

Subject: [PATCH] [BZ 195522] dbginfo.sh: addtional timeout and omitting a report
From: Joern Siglen <siglen@de.ibm.com>

Description:   dbginfo.sh: addtional timeout and omitting a report
Symptom:       blockdev report can hangup and block all data collection
Problem:       missing debug data
Solution:      "blockdev --report" -> remove
                add a second kill step with the same timeout
                value to retry stopping a command
Reproduction:  -
Upstream-ID:   a80c14d72c6d92de0eca5d9412b3d0bb989b97cc
Problem-ID:    195522

Upstream-Description:

              dbginfo.sh: addtional timeout and omitting a report

              running mpio data disks with offline paths might cause dbginfo
              to hang up on the command "blockdev --report" -> we remove
              it to ensure a non blocking data collection.
              In addition we add a second kill step with the same timeout
              value to retry stopping a command

              Signed-off-by: Joern Siglen <siglen@de.ibm.com>
              Reviewed-by: Mario Held <mario.held@de.ibm.com>
              Signed-off-by: Jan Hoeppner <hoeppner@linux.ibm.com>


Signed-off-by: Joern Siglen <siglen@de.ibm.com>
--- s390-tools-service.orig/scripts/dbginfo.sh
+++ s390-tools-service/scripts/dbginfo.sh
@@ -55,7 +55,7 @@ readonly ZDEV_CONF=$(lszdev --configured
 readonly ZDEV_OFF=$(lszdev --offline 2>/dev/null | wc -l)
 readonly ZDEV_ONL=$(lszdev --online 2>/dev/null | wc -l)
 
-paramWORKDIR_BASE="/tmp/"  # initial default path
+paramWORKDIR_BASE="/tmp"  # initial default path
 
 ########################################
 # print dbginfo.sh version info
@@ -411,7 +411,6 @@ CMDS="uname -a\
   :timedatectl\
   :runlevel\
   :ulimit -a\
-  :blockdev --report\
   :env\
   :df -h\
   :df -i\
@@ -1070,7 +1069,7 @@ call_run_command() {
 
     # check if calling command and timeout exist
     if which "${raw_cmd}" >/dev/null 2>&1 && which timeout >/dev/null 2>&1; then
-	eval timeout ${TOS} "${cmd}" >> ${logfile} 2>&1
+	eval timeout -k ${TOS} ${TOS} "${cmd}" >> ${logfile} 2>&1
 	rc=$?
     # check if command is a builtin (no use of timeout possible)
     elif command -v "${raw_cmd}" >/dev/null 2>&1; then