From 4e7e1d95841d254945979d5bb1d60157e18706b5 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Wed, 19 Sep 2018 17:10:13 +0200
Subject: [all] New license clauses as to ticket #3132: No more openSLX GmbH

---
 .../vmchooser/data/linux/includes/10_functions.inc | 27 ----------------------
 .../data/linux/includes/60_resolution.inc          | 25 +++++++++++++++++++-
 .../opt/openslx/vmchooser/data/linux/resolution    |  6 ++++-
 3 files changed, 29 insertions(+), 29 deletions(-)

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

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc
index 8d004f48..4b31d16a 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc
@@ -121,32 +121,5 @@ function mount_share()
 
 ### Funktionen Mounter Ende #######################
 
-### Funktionen resolution #########################
-
-get_xauthfile()
-{
-	# Das ist mitunter ein Problem, da die richtige xauth zu finden - Distroabhängig!
-	for wartezeit in 1 2 3 5 10 10 0 ende; do
-		[ "$wartezeit" = "ende" ] && { logger "openslx resolution utility: XAUTHFILE not found. Exiting."; exit 1; }
-		XAUTHORITY=$(ps aux | grep -o "root.*X.* \-auth *[^ ]*" | awk '{print $NF}')
-		[ -n "${XAUTHORITY}" ] && break
-		sleep $wartezeit
-	done
-	logger "openslx resolution utility: XAUTHFILE found."
-}
-
-
-check_resolution() {
-	ACTRES=$(DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr|grep '*'|tr -s " "|cut -f 2 -d " ")
-	if [ "$ACTRES" != "$RESOLUTION" ]; then
-		logger "openslx resolution utility: resolution changed; re-changing."
-		DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr --output ${AUSGABE} --mode ${RESOLUTION}
-	else
-		logger "openslx resolution utility: resolution unchanged."
-	fi
-}
-
-### Funktionen resolution Ende ####################
-
 ### Funktionen Ende ###############################
 
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/60_resolution.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/60_resolution.inc
index cdb895bf..86de6096 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/60_resolution.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/60_resolution.inc
@@ -1,6 +1,29 @@
+get_xauthfile()
+{
+	# Das ist mitunter ein Problem, da die richtige xauth zu finden - Distroabhängig!
+	for wartezeit in 1 2 3 5 10 10 0 ende; do
+		[ "$wartezeit" = "ende" ] && { logger "openslx resolution utility: XAUTHFILE not found. Exiting."; exit 1; }
+		XAUTHORITY=$(ps aux | grep -o "root.*X.* \-auth *[^ ]*" | awk '{print $NF}')
+		[ -n "${XAUTHORITY}" ] && break
+		sleep $wartezeit
+		done
+	logger "openslx resolution utility: XAUTHFILE found."
+}
+
+
+check_resolution() {
+	ACTRES=$(DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr|grep '*'|tr -s " "|cut -f 2 -d " ")
+	if [ "$ACTRES" != "$RESOLUTION" ]; then
+		logger "openslx resolution utility: resolution changed; re-changing."
+		DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr --output ${AUSGABE} --mode ${RESOLUTION}
+	else
+		logger "openslx resolution utility: resolution unchanged."
+	fi
+}
+
 set_resolution()
 {
-	DISPLAY="${1}.0"
+	DISPLAY="${1}.0" 
 	logger "openslx resolution utility started."
 	
 	# Da nun fremdgemountet wird, hier sicherheitshalber zur Kontrolle wg. Gross-/Kleinschreibung:
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
-- 
cgit v1.2.3-55-g7522