From 6b7797aaaf4cdda988a3ffc791ec4d251dd98d98 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 2 Aug 2023 17:07:55 +0200
Subject: [debug-report-bwlp] Gracefully handle hung Xorg

... instead of hanging too
---
 core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report b/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report
index 87b61041..4f82aa33 100755
--- a/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report
+++ b/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report
@@ -1,6 +1,9 @@
 #!/bin/bash
 # bash because of {,} expansion
 
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+
 TOOLS=(
 	"journalctl -a"
 	systemctl
@@ -175,7 +178,11 @@ fi
 if [ -n "$XAUTHORITY" ]; then
 	export DISPLAY
 	export XAUTHORITY
-	xrandr --verbose > "generated/xrandr-out" 2> "generated/xrandr-err"
+	if timeout --help 2>&1 | grep -q -F -- '-k'; then
+		timeout -k 1 2 xrandr --verbose
+		else
+			timeout -s 9 3 xrandr --verbose
+		fi > "generated/xrandr-out" 2> "generated/xrandr-err"
 	echo -n "."
 fi
 
-- 
cgit v1.2.3-55-g7522