From f2c543b4ccad3b9f8871d952cddf66b3b438595b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 2 Jul 2021 22:49:35 +0200
Subject: Merging upstream version 1.14.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 scripts/gen-hostnqn.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts/gen-hostnqn.sh')

diff --git a/scripts/gen-hostnqn.sh b/scripts/gen-hostnqn.sh
index d8783cf..5138f0c 100644
--- a/scripts/gen-hostnqn.sh
+++ b/scripts/gen-hostnqn.sh
@@ -2,7 +2,11 @@
 
 LC_ALL=C
 
-UUID=$(dmidecode -s system-uuid | tr -d '[:space:]')
+if [ -e "/proc/device-tree/ibm,partition-uuid" ] ; then
+	UUID=$(tr -d '\0' < /proc/device-tree/ibm,partition-uuid)
+else
+	UUID=$(dmidecode -s system-uuid | tr -d '[:space:]')
+fi
 
 if [ -z "$UUID" ] ; then
 	>&2 echo "No UUID found, can't determine hostnqn."
-- 
cgit v1.2.3