diff options
| author | Simon Rettberg | 2017-04-25 11:43:22 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-04-25 11:43:22 +0200 |
| commit | 93a3466eaa534cd078c72ccb0d910b6c271b48fb (patch) | |
| tree | a291db4cf28bcd9df9aec6d94eefdb2b4113032e /core/modules/vmchooser2/data | |
| parent | [run-virt] Floppy (fd1)-scripts: Some more testing, some hardening (diff) | |
| download | mltk-93a3466eaa534cd078c72ccb0d910b6c271b48fb.tar.gz mltk-93a3466eaa534cd078c72ccb0d910b6c271b48fb.tar.xz mltk-93a3466eaa534cd078c72ccb0d910b6c271b48fb.zip | |
[vmchooser2] Support SLX_AUTOSTART_UUID
First half of refs #3070
Diffstat (limited to 'core/modules/vmchooser2/data')
| -rwxr-xr-x | core/modules/vmchooser2/data/opt/openslx/bin/vmchooser | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser index 3e41c813..3153d6f1 100755 --- a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser +++ b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser @@ -38,7 +38,11 @@ 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" +if [ -n "$SLX_EXAM" ]; then + EXTRA="$EXTRA --exam-mode" +elif [ -n "$SLX_AUTOSTART_UUID" ]; then + SLX_EXAM_START="$SLX_AUTOSTART_UUID" +fi [ -z "$SLX_NO_PVS" ] && EXTRA="$EXTRA --pvs" # No quotes around $EXTRA! |