diff options
author | Christian Rößler | 2018-06-04 10:50:24 +0200 |
---|---|---|
committer | Christian Rößler | 2018-06-04 10:50:24 +0200 |
commit | cb9d67e75e1b81115cce10f2e95c722f4b7e2120 (patch) | |
tree | ed4617103e96a6c025eca73da7757c9fc4eaf5ef /core/modules/run-virt | |
parent | Merge branch 'master' of git.openslx.org:openslx-ng/mltk (diff) | |
download | mltk-cb9d67e75e1b81115cce10f2e95c722f4b7e2120.tar.gz mltk-cb9d67e75e1b81115cce10f2e95c722f4b7e2120.tar.xz mltk-cb9d67e75e1b81115cce10f2e95c722f4b7e2120.zip |
[run-virt] resolution modeline detection
Diffstat (limited to 'core/modules/run-virt')
-rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution | 2 | ||||
-rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution_standalone | 2 |
2 files changed, 2 insertions, 2 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 a4811355..c22bcf80 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 @@ -60,7 +60,7 @@ for wartezeit in 1 1 1 2 0 ende; do done # Pruefen, ob xrand eine passende modeline ausgibt: -if [ "$(DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY} xrandr | grep -c ${RESOLUTION})" -eq 0 ]; then +if [ "$(DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY} xrandr | grep -c ${RESOLUTION}[[:space:]])" -eq 0 ]; then logger "openslx resolution utility: xrandr yields no fitting modeline; adding one." MODELINE=$(cvt ${RESOLUTION//x/ } | grep -v "^#" | sed "s/Modeline //g" | sed 's/"//g') DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr --newmode $(echo ${MODELINE}) diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution_standalone b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution_standalone index 0dbbcf98..0f93c718 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution_standalone +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution_standalone @@ -95,7 +95,7 @@ if [ -z "$AUSGABE" ]; then fi # Pruefen, ob xrand eine passende modeline ausgibt: -if [ "$(xrandr | grep -c ${RESOLUTION})" -eq 0 ]; then +if [ "$(xrandr | grep -c ${RESOLUTION}[[:space:]])" -eq 0 ]; then logger "openslx resolution utility: xrandr yields no fitting modeline; adding one." MODELINE=$(cvt ${RESOLUTION//x/ } | grep -v "^#" | sed "s/Modeline //g" | sed 's/"//g') xrandr --newmode $(echo ${MODELINE}) |