From b21d2bb616a2b0ecd641707a783b84903d97ce36 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Wed, 25 Jul 2018 16:08:45 +0200
Subject: [run-virt] linux scripts extended (minimised, user etc). TO BE
 TESTED!

---
 .../opt/openslx/vmchooser/data/linux/resolution    | 25 ++++++----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

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

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 c22bcf80..162f4d08 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,35 +7,22 @@
 # Zu erledigen: Jede Menge, zB anständiges Trapping, Fehler abfangen usw...
 # set -x
 
-MOUNTDIR=/mnt/diskmount
-RESFILE="${MOUNTDIR}"/openslx.ini
 DISPLAY=:0.0
 
-check_resolution() {
-	# Now, let's wait even more seconds to see if another process re-changes res.:
-	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
-}
-
 logger "openslx resolution utility started."
 
 # Da nun fremdgemountet wird, hier sicherheitshalber zur Kontrolle wg. Gross-/Kleinschreibung:
-RESFILE=$(find "${MOUNTDIR}" -iwholename "${RESFILE}")
+SLXCONFIGFILE=$(find "${DISKMOUNTDIR}" -iwholename "${SLXCONFIGFILE}")
 
-if [ -f "$RESFILE" ]; then
-	RESOLUTION=$(grep 'resolution=' "$RESFILE" | cut -d '=' -f 2)
+if [ -f "$SLXCONFIGFILE" ]; then
+	RESOLUTION=$(grep 'resolution=' "$SLXCONFIGFILE" | cut -d '=' -f 2)
 	if [ -z $RESOLUTION ]; then
-		logger "openslx resolution utility: resolution file $RESFILE seems to be empty!"
+		logger "openslx resolution utility: resolution file $SLXCONFIGFILE seems to be empty!"
 		exit 1
 	fi
-	logger "openslx resolution utility: resolution file $RESFILE yields ${RESOLUTION}."
+	logger "openslx resolution utility: resolution file $SLXCONFIGFILE yields ${RESOLUTION}."
 else
-	logger "openslx resolution utility: resolution file $RESFILE not found!"
+	logger "openslx resolution utility: resolution file $SLXCONFIGFILE not found!"
 	exit 1
 fi
 
-- 
cgit v1.2.3-55-g7522