diff options
| author | Simon Rettberg | 2013-11-16 12:10:12 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-16 12:10:12 +0100 |
| commit | 6e2b26c2b1bba2810c6cefff659e66d5613d563c (patch) | |
| tree | 4ff796678336b188681c582649462195a6d88d16 /remote | |
| parent | [pam-offenburg] Cleanup, style, fix session close script (diff) | |
| parent | [vmchooser] quick fix for tcpsrvd not exiting properly. (diff) | |
| download | tm-scripts-6e2b26c2b1bba2810c6cefff659e66d5613d563c.tar.gz tm-scripts-6e2b26c2b1bba2810c6cefff659e66d5613d563c.tar.xz tm-scripts-6e2b26c2b1bba2810c6cefff659e66d5613d563c.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt index dac60520..01456c0f 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -519,20 +519,20 @@ if [ -e /opt/openslx/etc/"${xmlvirt}"/run-virt.include ] ; then sleep "$timeout" done fi - + # Postrun for commands after virtualization finishes + if [ -n "${POSTRUN}" ]; then + eval ${POSTRUN} >/dev/null 2>&1 + fi + + # Kill LPD + kill $PID_LPD + cleanexit 0 else writelog "Failed because of missing ${xmlvirt} plugin." cleanexit 1 fi -# Postrun for commands after virtualization finishes -if [ -n "${POSTRUN}" ]; then - eval ${POSTRUN} >/dev/null 2>&1 -fi - -# Kill LPD -kill $PID_LPD cleanexit 0 |