From 4f701fca56a6d0a826b2cc44b23472f2eecd6911 Mon Sep 17 00:00:00 2001
From: thaibault
Date: Tue, 2 Jul 2013 14:49:40 +0200
Subject: Sync files with patched branch.

---
 remote/modules/vmchooser/data/opt/openslx/bin/clc.bash     |  0
 remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh  | 14 ++++++--------
 remote/modules/vmchooser/data/opt/openslx/bin/xmlfilter.sh |  0
 3 files changed, 6 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 remote/modules/vmchooser/data/opt/openslx/bin/clc.bash
 mode change 100755 => 100644 remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh
 mode change 100755 => 100644 remote/modules/vmchooser/data/opt/openslx/bin/xmlfilter.sh

(limited to 'remote/modules')

diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/clc.bash b/remote/modules/vmchooser/data/opt/openslx/bin/clc.bash
old mode 100755
new mode 100644
diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh b/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh
old mode 100755
new mode 100644
index 48c63789..826bfecd
--- a/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh
+++ b/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh
@@ -117,7 +117,7 @@ if [[ "$(grep --extended-regexp '< *persistent *param=".+"' "$1")" ]]; then
     imageFilePath=$(grep -io '<image_name param=.*"' "$1" \
         | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
     diskmode='persistent' && \
-    # TODO(torben) path shouldn't be hardcoded.
+    # TODO path shouldn't be hardcoded.
     xmlfile="/var/lib/virt/vmware/$(sed 's/-persistent$//g' <<< "$(sed 's/vmdk$/xml/g' <<< "$(basename "$imageFilePath")")")" && \
     # NOTE: We have to make sure that this folder is present to prevent
     # getting an empty string by "readlink".
@@ -125,7 +125,7 @@ if [[ "$(grep --extended-regexp '< *persistent *param=".+"' "$1")" ]]; then
     userBranchFilePath="$(readlink --canonicalize ~/.persistentVirtualMachines/$(basename "$imageFilePath"))"
     # Create linked clone if not exists.
     if [ ! -f "$userBranchFilePath" ]; then
-        # TODO(torben) path shouldn't be hardcoded.
+        # TODO path shouldn't be hardcoded.
         /opt/openslx/plugin-repo/vmchooser/clc.bash "$xmlfile" \
             "$userBranchFilePath" --debug --verbose
     fi
@@ -137,7 +137,7 @@ if ls ${xmlfile} 2>/dev/null | grep '/' >/dev/null 2>&1; then
   xmlpath=$(dirname ${xmlfile})
   xmlfile=$(basename ${xmlfile})
 else
-  xmlpath=${path}
+  xmlpath=${vmchooser_xmlpath}
 fi
 # full path
 xmlfile="${xmlpath}/${xmlfile%.xml}.xml"
@@ -191,11 +191,10 @@ writelog "VM config:"
 # Name of the virt image
 imgname=$(grep -io '<image_name param=.*"' ${xmlfile} \
           | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-# TODO(torben) check if this code is necessary in future.
 ## Added for persistent support.
-#if [[ "$userBranchFilePath" ]]; then
-#    imgname="$userBranchFilePath"
-#fi
+if [[ "$userBranchFilePath" ]]; then
+    imgname="$userBranchFilePath"
+fi
 ##
 
 # Imagename /w full path
@@ -208,7 +207,6 @@ if echo ${imgname} 2>/dev/null | grep -q '^/' >/dev/null 2>&1; then
 elif echo ${xmlfile} 2>/dev/null | grep -q '^/tmp/' >/dev/null 2>&1; then
   vmpath=$imgname
   imgname=$(basename ${imgname})
-# TODO(torben) check if this code is necessary in future.
 ## Added for persistent support.
 elif [[ "$userBranchFilePath" ]]; then
   vmpath="$userBranchFilePath"
diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/xmlfilter.sh b/remote/modules/vmchooser/data/opt/openslx/bin/xmlfilter.sh
old mode 100755
new mode 100644
-- 
cgit v1.2.3-55-g7522