diff options
| author | Simon Rettberg | 2017-11-23 16:22:17 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-11-23 16:22:17 +0100 |
| commit | 69901c55013efc74da917009f3d24e239d8b1696 (patch) | |
| tree | d95adc185e8cbd494989946cd47c51e41ca0f014 /core/modules/vmchooser2 | |
| parent | [ldm-greeter-bwlp] Only consider SLX_AUTOLOGIN for autologin (diff) | |
| download | mltk-69901c55013efc74da917009f3d24e239d8b1696.tar.gz mltk-69901c55013efc74da917009f3d24e239d8b1696.tar.xz mltk-69901c55013efc74da917009f3d24e239d8b1696.zip | |
[ldm/vmchooser2] Change autologin handling, support --autoquit config
Diffstat (limited to 'core/modules/vmchooser2')
| -rwxr-xr-x | core/modules/vmchooser2/data/opt/openslx/bin/vmchooser | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser index 21efe6df..39563322 100755 --- a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser +++ b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser @@ -50,11 +50,15 @@ if [ -z "$SLX_NO_PVS" ]; then fi fi +if [ -z "${SLX_AUTOLOGIN%OFF}" ] && [ -n "$SLX_VMCHOOSER_TIMEOUT" ] && [ "$SLX_VMCHOOSER_TIMEOUT" -gt 0 ]; then + EXTRA="$EXTRA --autoquit $SLX_VMCHOOSER_TIMEOUT" +fi + # No quotes around $EXTRA! if [ -z "$SLX_LOCATIONS" ]; then - exec vmchooser.real "$@" --url "$URL" --fullscreen --tab "$TAB" --start-uuid "$SLX_EXAM_START" --autoquit 120 $EXTRA + exec vmchooser.real "$@" --url "$URL" --fullscreen --tab "$TAB" --start-uuid "$SLX_EXAM_START" $EXTRA fi # No quotes around $EXTRA! -exec vmchooser.real "$@" --url "$URL" --fullscreen --tab "$TAB" --start-uuid "$SLX_EXAM_START" --locations "$SLX_LOCATIONS" --autoquit 120 $EXTRA +exec vmchooser.real "$@" --url "$URL" --fullscreen --tab "$TAB" --start-uuid "$SLX_EXAM_START" --locations "$SLX_LOCATIONS" $EXTRA |