[vmchooser2] Add sessionstart script for logging session name

2 files changed, 12 insertions, 1 deletions

diff --git a/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart b/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart
index be3235c1..1cc7eb5f 100755
--- a/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart
+++ b/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart
@@ -4,7 +4,13 @@ SOURCEPATH="/opt/openslx/vmchooser/sessionstart.d"
 
 if [ -d "$SOURCEPATH" ]; then
 	for file in $SOURCEPATH/*; do
-		"$file" || slxlog "vmchooser-sessionstart" "Could not source $file at session start!" "$file"
+		"$file"
+		RET=$?
+		if [ "$RET" != 0 ]; then
+			param="$file"
+			[ "$(head -n 1 "$file" | cut -b 1)" != "#" ] && param=
+			slxlog "vmchooser-sessionstart" "$file returned $RET at session start!" "$param"
+		fi
 	done
 fi
 
diff --git a/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart.d/log-selected-session b/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart.d/log-selected-session
new file mode 100755
index 00000000..2499b3b7
--- /dev/null
+++ b/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart.d/log-selected-session
@@ -0,0 +1,5 @@
+#!/bin/ash
+
+[ -n "$SESSION_NAME" ] && slxlog ".vmchooser-session-name" "$SESSION_NAME"
+
+exit 0