From 29e7fc91ac2f1a3f2922fad7bbcd1bcf33fd9b4c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 26 Jun 2019 10:53:41 +0200
Subject: [run-virt] Slightly better wait for WM (with timeout)

---
 .../data/opt/openslx/vmchooser/data/linux/includes/90_runscript.inc  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux')

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/90_runscript.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/90_runscript.inc
index 6536d9a5..0cd47427 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/90_runscript.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/90_runscript.inc
@@ -2,8 +2,11 @@ function wait_for_wm()
 {
 	# This just waits until there's a window manager.
 	logger "openslx utility: wait_for_wm: Waiting for window manager."
-	while [[ "$(DISPLAY=:0.0 XAUTHORITY=${XAUTHORITY} xprop -root _NET_SUPPORTING_WM_CHECK)" =~ "no such atom" ]]; do
+	local expr="no such atom|not found"
+	local max=10
+	while [[ "$(DISPLAY=:0.0 XAUTHORITY=${XAUTHORITY} xprop -root _NET_SUPPORTING_WM_CHECK)" =~ $expr ]]; do
 		sleep 2
+		[ $(( --max )) -le 0 ] && break
 	done
 	logger "openslx utility: wait_for_wm: Window manager detected."
 }
-- 
cgit v1.2.3-55-g7522