diff options
| author | Christian Rößler | 2018-09-19 17:10:13 +0200 |
|---|---|---|
| committer | Christian Rößler | 2018-09-19 17:10:13 +0200 |
| commit | 4e7e1d95841d254945979d5bb1d60157e18706b5 (patch) | |
| tree | 383bec849cbd3ca6c84c78a4b8d1619b99490eef /core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes | |
| parent | [vbox-src] Use http so proxy can cache (diff) | |
| download | mltk-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/includes')
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc | 27 | ||||
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/60_resolution.inc | 25 |
2 files changed, 24 insertions, 28 deletions
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: |