From 0d2b5af007e60c39b6c93f3d46a9e5bcb7dc0a56 Mon Sep 17 00:00:00 2001
From: Joern Siglen <siglen@de.ibm.com>
Date: Tue, 23 Jan 2024 10:50:58 +0100
Subject: [PATCH] dbginfo.sh: check for DPM mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

check if the LPAR is running in DPM mode and reflect this in the summary.

Suggested-by: Mike Storzer <MSTORZER@de.ibm.com>
Acked-by: Eberhard Pasch <epasch@de.ibm.com>
Reviewed-by: Mario Held <mario.held@de.ibm.com>
Signed-off-by: Joern Siglen <siglen@de.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 CHANGELOG.md         |  5 ++++-
 scripts/dbginfo.sh   | 12 ++++++++++--
 scripts/dbginfo.sh.8 |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28d3d296..27180e95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,16 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
 
-* __v2.xx.x (2023-xx-xx)__
+* __v2.xx.x (2024-xx-xx)__
 
   For Linux kernel version: 6.x
 
   Add new tools / libraries:
 
   Changes of existing tools:
+  - dbginfo.sh: update man page and copyright
+  - dbginfo.sh: fix relative path on script copy
+  - dbginfo.sh: check for Dynamic Partition Mode
 
   Bug Fixes:
 
diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh
index cfcba2bf..7763067a 100755
--- a/scripts/dbginfo.sh
+++ b/scripts/dbginfo.sh
@@ -52,6 +52,14 @@ if test "x${PROCESSORVERSION}" = "xFF" || test "x${PROCESSORVERSION}" = "xff"; t
 else
 	RUNTIME_ENVIRONMENT="LPAR"
 fi
+# check for Dynamic Partition Mode
+readonly DPM_UUID=$(grep "LPAR UUID" /proc/sysinfo | \
+	sed 's/.*:[[:space:]]*\([[:graph:]]*\).*/\1/g')
+if test "${#DPM_UUID}" -eq 0; then
+	DPM_MODE="NO"
+else
+	DPM_MODE="YES"
+fi
 readonly SYSTEMHOSTNAME="$(hostname -s 2>/dev/null)" # hostname of system being analysed
 readonly TERMINAL="$(tty 2>/dev/null)"
 # timeout seconds TOS / kill timeout TOKS
@@ -156,7 +164,7 @@ print_check() {
 	cat <<EOF
 
 Hardware platform     = ${HW}
-Runtime environment   = ${RUNTIME_ENVIRONMENT}
+Runtime environment   = ${RUNTIME_ENVIRONMENT} - DPM: ${DPM_MODE}
 $(cat /proc/sysinfo | grep 'Name')
 Kernel version        = ${KERNEL_INFO}
 OS version / distro   = ${OS_NAME}
@@ -1531,7 +1539,7 @@ trap emergency_exit SIGHUP SIGINT SIGTERM
 
 pr_log_stdout ""
 pr_log_stdout "Hardware platform     = ${HW}"
-pr_log_stdout "Runtime environment   = ${RUNTIME_ENVIRONMENT}"
+pr_log_stdout "Runtime environment   = ${RUNTIME_ENVIRONMENT} - DPM: ${DPM_MODE}"
 pr_log_stdout "Kernel version        = ${KERNEL_INFO} (${KERNEL_BASE})"
 pr_log_stdout "OS version / distro   = ${OS_NAME}"
 pr_log_stdout "Date and time of info = ${DATETIME}"
diff --git a/scripts/dbginfo.sh.8 b/scripts/dbginfo.sh.8
index fc8aa180..917f41f6 100644
--- a/scripts/dbginfo.sh.8
+++ b/scripts/dbginfo.sh.8
@@ -63,7 +63,7 @@ Copyright IBM Corp. 2002, 2024
 .PP
 Hardware platform     = s390x
 .br
-Runtime environment   = z/VM
+Runtime environment   = z/VM - DPM: NO
 .br
 Kernel version        = 5.14.0 (5.14.0-162.6.1.el9_1.s390x)
 .br