diff options
| author | Simon Rettberg | 2017-02-22 15:39:33 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-02-22 15:39:33 +0100 |
| commit | 919293c316244b9508bd0d1d44d36c6fe53a1a39 (patch) | |
| tree | 8beb28d673ac2a61768e8721ba952560497175c7 /core/modules/run-virt/data/opt/openslx/vmchooser | |
| parent | [printergui] printergui.service: Added stage4.target to after (diff) | |
| download | mltk-919293c316244b9508bd0d1d44d36c6fe53a1a39.tar.gz mltk-919293c316244b9508bd0d1d44d36c6fe53a1a39.tar.xz mltk-919293c316244b9508bd0d1d44d36c6fe53a1a39.zip | |
[run-virt] Support passing credentials to runscript
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser')
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe | bin | 53248 -> 54784 bytes | |||
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe b/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe Binary files differindex c0904c92..66a87bd9 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc index cd705333..f3db24b5 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc @@ -84,6 +84,7 @@ setup_virtual_floppy() { remapMode=${SHARE_REMAP_MODE_INI} homeDrive=${SHARE_HOME_DRIVE} scriptExt=${EXT} + passCreds=${SHARE_CREDENTIAL_PASSTHROUGH} [remap] documents=${SHARE_DOCUMENTS} @@ -109,6 +110,11 @@ setup_virtual_floppy() { mcopy -i "${SLX_FLOPPY_IMG}" "${RUNSCRIPT}" "::/runscript${EXT}" fi + # Admin supplied runscript(s) + if [ -d "${VMCHOOSER_DIR}/adminrun" ]; then + mcopy -s -i "${SLX_FLOPPY_IMG}" "${VMCHOOSER_DIR}/adminrun" "::/" + fi + rm -f -- "${SHARES}" "${TMPDIR}/openslx.ini" "${TMPDIR}/HOSTRES.TXT" } |