diff options
| author | Simon Rettberg | 2016-09-02 17:59:02 +0200 |
|---|---|---|
| committer | root | 2016-09-02 17:59:02 +0200 |
| commit | 392ba80dd0caaede65d5c52c9eefb66bfe278096 (patch) | |
| tree | f5e55d80e372c325431de0f304fd37a41db2027b | |
| parent | [dmidecode] New module: Compile on our own so we support 'em all (diff) | |
| download | tm-scripts-392ba80dd0caaede65d5c52c9eefb66bfe278096.tar.gz tm-scripts-392ba80dd0caaede65d5c52c9eefb66bfe278096.tar.xz tm-scripts-392ba80dd0caaede65d5c52c9eefb66bfe278096.zip | |
[vmchooser] Enable exam mode param passing
| -rw-r--r-- | remote/modules/safe-mode/data/etc/X11/Xsession.d/00-exam-mode | 9 | ||||
| -rwxr-xr-x | remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/remote/modules/safe-mode/data/etc/X11/Xsession.d/00-exam-mode b/remote/modules/safe-mode/data/etc/X11/Xsession.d/00-exam-mode new file mode 100644 index 00000000..d4ab5359 --- /dev/null +++ b/remote/modules/safe-mode/data/etc/X11/Xsession.d/00-exam-mode @@ -0,0 +1,9 @@ +#!/bin/ash Being sourced but hey + +. /opt/openslx/config + +if [ "x$SLX_EXAM" = "xyes" ]; then + # Force usage of vmchooser + set -- "$(which vmchooser)" +fi + diff --git a/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser b/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser index dc659c64..2588c884 100755 --- a/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser +++ b/remote/modules/vmchooser2/data/opt/openslx/bin/vmchooser @@ -38,6 +38,7 @@ 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 |