diff options
| author | Simon Rettberg | 2016-01-07 11:42:25 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-01-07 11:42:25 +0100 |
| commit | 58ad24c4e6d05c6f91a6e7917cb79f219b6e5391 (patch) | |
| tree | 479a2bad82e30aeb71e9b7dad3605c47e4a831b0 | |
| parent | [xorg] Remove syntax error from .conf (diff) | |
| download | tm-scripts-58ad24c4e6d05c6f91a6e7917cb79f219b6e5391.tar.gz tm-scripts-58ad24c4e6d05c6f91a6e7917cb79f219b6e5391.tar.xz tm-scripts-58ad24c4e6d05c6f91a6e7917cb79f219b6e5391.zip | |
[vmchooser2] Configurable def. tab; fallback to mem size
| -rwxr-xr-x | remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser b/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser index 38d10fde..4f30f447 100755 --- a/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser +++ b/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser @@ -15,9 +15,18 @@ else # TODO: Tell user fi +MEM=$(grep -m1 '^MemTotal:' /proc/meminfo | awk '{print $2}') +if [ -n "$SLX_VMCHOOSER_TAB" ] && [ "$SLX_VMCHOOSER_TAB" -ge 0 -a "$SLX_VMCHOOSER_TAB" -le 2 ]; then + TAB="$SLX_VMCHOOSER_TAB" +elif [ "$MEM" -lt 3000000 ]; then # Check RAM size; if it's not that much, default to the native linux sessions + TAB=0 +else + TAB=2 +fi + if [ -n "$SLX_VM_POOL_FILTER" ]; then - vmchooser.real "$@" --url "$URL" --pool "$SLX_VM_POOL_FILTER" --fullscreen + exec vmchooser.real "$@" --url "$URL" --pool "$SLX_VM_POOL_FILTER" --fullscreen --tab "$TAB" else - vmchooser.real "$@" --url "$URL" --fullscreen + exec vmchooser.real "$@" --url "$URL" --fullscreen --tab "$TAB" fi |