diff options
| author | Christian Rößler | 2016-11-04 15:59:25 +0100 |
|---|---|---|
| committer | Christian Rößler | 2016-11-04 15:59:25 +0100 |
| commit | 13a665d7317615b472a66ce08fe6c0d126cdea39 (patch) | |
| tree | d5fd4b5f9879f97b5032fc99951d6d3aafc7e7df /remote/modules/vmchooser2/data | |
| parent | [run-virt] resolution scripts now detect first connected output device (not o... (diff) | |
| parent | [rfs-stage32] Run update-issue after setup_partitions for proper /tmp display (diff) | |
| download | tm-scripts-13a665d7317615b472a66ce08fe6c0d126cdea39.tar.gz tm-scripts-13a665d7317615b472a66ce08fe6c0d126cdea39.tar.xz tm-scripts-13a665d7317615b472a66ce08fe6c0d126cdea39.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmchooser2/data')
| -rwxr-xr-x | remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser | 5 | ||||
| -rwxr-xr-x | remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart.d/log-selected-session | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser b/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser index 0cf04135..2588c884 100755 --- a/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser +++ b/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser @@ -38,12 +38,13 @@ fi [ -n "$SLX_VMCHOOSER_TEMPLATES" ] && EXTRA="$EXTRA --template-mode $SLX_VMCHOOSER_TEMPLATES" [ -n "$SLX_VMCHOOSER_FORLOCATION" ] && EXTRA="$EXTRA --location-mode $SLX_VMCHOOSER_FORLOCATION" [ "$HW_KVM" != "ENABLED" ] && EXTRA="$EXTRA --no-vtx" +[ -n "$SLX_EXAM" ] && EXTRA="$EXTRA --exam-mode" # No quotes around $EXTRA! if [ -z "$SLX_LOCATIONS" ]; then - exec vmchooser.real "$@" --url "$URL" --fullscreen --tab "$TAB" $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" --locations "$SLX_LOCATIONS" $EXTRA +exec vmchooser.real "$@" --url "$URL" --fullscreen --tab "$TAB" --start-uuid "$SLX_EXAM_START" --locations "$SLX_LOCATIONS" $EXTRA 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 index 2499b3b7..fb8ae9eb 100755 --- 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 @@ -1,5 +1,16 @@ #!/bin/ash -[ -n "$SESSION_NAME" ] && slxlog ".vmchooser-session-name" "$SESSION_NAME" +[ -z "${SESSION_UUID}${SESSION_NAME}" ] && exit 0 + +. /opt/openslx/config + +[ -z "$SLX_REMOTE_LOG" ] && exit 0 + +REALUSER=$(whoami) +LOGUSER=0 +[ "x$SLX_REMOTE_LOG_SESSIONS" = "xyes" ] && LOGUSER=1 + +curl --data-urlencode "type=.vmchooser-session" --data-urlencode "uuid=$SESSION_UUID" --data-urlencode "name=$SESSION_NAME" \ + --data-urlencode "user=$REALUSER" --data-urlencode "loguser=$LOGUSER" "$SLX_REMOTE_LOG" exit 0 |