From be3d683dad0c368d3d6cd29692b687b9cc9f82c1 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 31 Oct 2014 16:06:25 +0100
Subject: [vmchooser] fix funny variables

---
 remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt  | 1 +
 remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt | 1 +
 2 files changed, 2 insertions(+)

(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 759b8352..726c2340 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -239,6 +239,7 @@ writelog "VM config:"
 imgname=$(grep -io '<image_path param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
 imgrelpath=$(grep -io '<image_name param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
 [ -z "$imgname" ] && imgname="${imgrelpath}"
+imgrelpath=${imgrelpath#/mnt/vmstore/}
 
 ## Added for persistent support.
 if [[ "$userBranchFilePath" ]]; then
diff --git a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
index 759b8352..726c2340 100755
--- a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
@@ -239,6 +239,7 @@ writelog "VM config:"
 imgname=$(grep -io '<image_path param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
 imgrelpath=$(grep -io '<image_name param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
 [ -z "$imgname" ] && imgname="${imgrelpath}"
+imgrelpath=${imgrelpath#/mnt/vmstore/}
 
 ## Added for persistent support.
 if [[ "$userBranchFilePath" ]]; then
-- 
cgit v1.2.3-55-g7522