From 90cdae646b68c93bc3c7d17c0dc4672659df6f3f Mon Sep 17 00:00:00 2001
From: thaibault
Date: Thu, 8 Aug 2013 19:53:25 +0200
Subject: Fix statefile moving.

---
 remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 2 +-
 remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'remote/modules')

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 81498227..8dea615b 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -472,7 +472,7 @@ fi
 
 # Postrun for commands after virtualization finishes
 if [ -n "${POSTRUN}" ]; then
-	eval ${POSTRUN}  >/dev/null 2>&1
+	eval ${POSTRUN} >/dev/null 2>&1
 fi
 
 cleanexit 0
diff --git a/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
index 9a817d65..084828ff 100755
--- a/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
+++ b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
@@ -527,7 +527,7 @@ if [[ "$originalVMDKFilePath" ]]; then
         stateFileConfiguration="
 checkpoint.vmState = \"$stateFilePath\""
     fi
-    POSTRUN="stateFilePath=\"\$(readlink --canonicalize \"${confdir}/\"*.vmss)\" && memoryFilePath=\"\$(readlink --canonicalize \"${confdir}/\"*.vmem)\" && [ -f \"\$stateFilePath\" ] && echo \"Saving state and memory file \\\"\$stateFilePath\\\" and \\\"\$memoryFilePath\\\".\" && mv --force \"\$stateFilePath\" \"$(dirname "$diskfile")/\" && mv --force \"\$memoryFilePath\" \"$(dirname "$diskfile")/\""
+    POSTRUN="stateFilePath=\"\$(readlink -f \"${confdir}/\"*.vmss)\" && memoryFilePath=\"\$(readlink -f \"${confdir}/\"*.vmem)\" && [ -f \"\$stateFilePath\" ] && echo \"Saving state and memory file \\\"\$stateFilePath\\\" and \\\"\$memoryFilePath\\\".\" && mv -f \"\$stateFilePath\" \"$(dirname "$diskfile")/\" && mv -f \"\$memoryFilePath\" \"$(dirname "$diskfile")/\""
 fi
 ##
 hddrv=$(echo "${imghead}" | grep -m1 -ia "ddb.adapterType" | awk -F '"' '{print $2}')
-- 
cgit v1.2.3-55-g7522