summaryrefslogtreecommitdiffstats
path: root/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution
diff options
context:
space:
mode:
authorChristian Rößler2018-09-19 17:10:13 +0200
committerChristian Rößler2018-09-19 17:10:13 +0200
commit4e7e1d95841d254945979d5bb1d60157e18706b5 (patch)
tree383bec849cbd3ca6c84c78a4b8d1619b99490eef /core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution
parent[vbox-src] Use http so proxy can cache (diff)
downloadmltk-4e7e1d95841d254945979d5bb1d60157e18706b5.tar.gz
mltk-4e7e1d95841d254945979d5bb1d60157e18706b5.tar.xz
mltk-4e7e1d95841d254945979d5bb1d60157e18706b5.zip
[all] New license clauses as to ticket #3132: No more openSLX GmbH
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution')
-rwxr-xr-xcore/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution
index 162f4d08..84775db7 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution
@@ -7,6 +7,10 @@
# Zu erledigen: Jede Menge, zB anständiges Trapping, Fehler abfangen usw...
# set -x
+OWNDIR=$(dirname $0)
+source "$(dirname $0)"/includes/00_vars.inc
+source "$(dirname $0)"/includes/60_resolution.inc
+
DISPLAY=:0.0
logger "openslx resolution utility started."
@@ -39,7 +43,7 @@ logger "openslx resolution utility: XAUTHFILE found."
# Zu verbessern: Der Name des Verbundenen ist nicht immer bekannt. Daher nehmen wir das
# erste 'connected' in der Ausgabe xrandrs Und warten evtl. ein Weilchen)::
-for wartezeit in 1 1 1 2 0 ende; do
+for wartezeit in 1 1 1 2 2 2 4 4 8 8 0 ende; do
[ "$wartezeit" = "ende" ] && { logger "openslx resolution utility: Could not detect output device. Exiting." ; exit 1; }
AUSGABE=$(DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr -q|grep -m 1 " connected "|awk '{print $1}')
[ -n "$AUSGABE" ] && break