summaryrefslogtreecommitdiffstats
path: root/core/modules/debug-report-bwlp
diff options
context:
space:
mode:
authorSimon Rettberg2017-12-14 14:22:33 +0100
committerSimon Rettberg2017-12-14 14:22:33 +0100
commit27e7a8a72925e7c5df7e1e02176a21a42e87c3ce (patch)
tree3ce2b2736d6c3d09d0e1ca69204be16c83c52eb7 /core/modules/debug-report-bwlp
parent[debug-report-bwlp] Extend: systemd-analyze and xrandr (diff)
downloadmltk-27e7a8a72925e7c5df7e1e02176a21a42e87c3ce.tar.gz
mltk-27e7a8a72925e7c5df7e1e02176a21a42e87c3ce.tar.xz
mltk-27e7a8a72925e7c5df7e1e02176a21a42e87c3ce.zip
[debug-report-bwlp] Try to figure out display if not running under X
Diffstat (limited to 'core/modules/debug-report-bwlp')
-rwxr-xr-xcore/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report8
1 files changed, 7 insertions, 1 deletions
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 14cdaf4e..3f59bce4 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
@@ -95,7 +95,13 @@ echo -n "."
ps auxf > "generated/ps-out" 2> "generated/ps-err"
echo -n "."
-if [ -n "$DISPLAY" ]; then
+if [ -z "$DISPLAY" ]; then
+ DISPLAY=:0
+ XAUTHORITY=$(ps a | grep " $DISPLAY " | grep -o -- '-auth.*$' | grep -m1 -v grep | awk '{print $2}')
+fi
+if [ -n "$XAUTHORITY" ]; then
+ export DISPLAY
+ export XAUTHORITY
xrandr --verbose > "generated/xrandr-out" 2> "generated/xrandr-err"
echo -n "."
fi