From 4325b5aa2ce5f7f6e3e9ec7f59ff91d246c0903d Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 7 May 2018 16:45:37 +0200
Subject: [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
---
 core/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'core/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt')

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
-- 
cgit v1.2.3-55-g7522