diff options
| author | Jonathan Bauer | 2018-05-07 16:45:37 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2018-05-07 16:45:37 +0200 |
| commit | 4325b5aa2ce5f7f6e3e9ec7f59ff91d246c0903d (patch) | |
| tree | 10c6a575047afe6159d901bb056caa402f090697 /core | |
| parent | [vmware*] fix CPU_CORES for vmware14 too (diff) | |
| download | mltk-4325b5aa2ce5f7f6e3e9ec7f59ff91d246c0903d.tar.gz mltk-4325b5aa2ce5f7f6e3e9ec7f59ff91d246c0903d.tar.xz mltk-4325b5aa2ce5f7f6e3e9ec7f59ff91d246c0903d.zip | |
[run-virt] wait before calling slxlog on exit 141
If the main run-virt script exits with 141 (which happens when it is
killed by either loginctl on SLX_LOGOUT_TIMEOUT or when killing X with
alt-printscreen-k), sleep 3 seconds to try and avoid the unnecessary
slxlog messages.
Closes #3365
Diffstat (limited to 'core')
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt b/core/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt index 96a47ea6..307b6872 100755 --- a/core/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt +++ b/core/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt @@ -31,6 +31,11 @@ launch_runvirt() { # script exited here, check for exit code and send logfile to sat if appropriate local RUNVIRT_RET="$?" if [ ${RUNVIRT_RET} -ne 0 ]; then + if [ ${RUNVIRT_RET} -eq 141 ]; then + # 141 happens on alt + print screen + k or upon automatic logout via systemd + # just sleep here to avoid these annoying (and misleading) slxlogs.... + sleep 3 + fi [ -f "${LOGFILE}" ] && log "Runvirt failed with '${RUNVIRT_RET}'." return 1 fi |