diff options
| author | Simon Rettberg | 2019-06-26 10:53:41 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-06-26 10:53:41 +0200 |
| commit | 29e7fc91ac2f1a3f2922fad7bbcd1bcf33fd9b4c (patch) | |
| tree | cf2ca6c21e37ab964ff350dae3e5fb0bc6771724 /core/modules/run-virt/data/opt/openslx/vmchooser/data/linux | |
| parent | [dnbd3/vbox] pam: move scripts from auth to session open (diff) | |
| download | mltk-29e7fc91ac2f1a3f2922fad7bbcd1bcf33fd9b4c.tar.gz mltk-29e7fc91ac2f1a3f2922fad7bbcd1bcf33fd9b4c.tar.xz mltk-29e7fc91ac2f1a3f2922fad7bbcd1bcf33fd9b4c.zip | |
[run-virt] Slightly better wait for WM (with timeout)
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux')
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/90_runscript.inc | 5 |
1 files changed, 4 insertions, 1 deletions
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." } |