diff options
| author | thaibault | 2013-08-08 18:57:29 +0200 |
|---|---|---|
| committer | torben | 2013-08-08 18:57:29 +0200 |
| commit | c2f82bfd7db133040070bb17c8f0a8ea0cff2ca3 (patch) | |
| tree | ed378c6b4af328dab9f16def2e27f18674b18983 /remote/modules/vmchooser | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-c2f82bfd7db133040070bb17c8f0a8ea0cff2ca3.tar.gz tm-scripts-c2f82bfd7db133040070bb17c8f0a8ea0cff2ca3.tar.xz tm-scripts-c2f82bfd7db133040070bb17c8f0a8ea0cff2ca3.zip | |
Fix bug in xml filter.
Diffstat (limited to 'remote/modules/vmchooser')
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter index 1f6c5985..697c2fe2 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter @@ -40,12 +40,11 @@ function handlePersistentVM() { # user we provide an additional persistent version. local imageName=$(basename "$(grep -io '<image_name param=.*"' "$1" | \ sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')") && \ - cd "$SLX_VM_PERSISTENT_PATH" >/dev/null && \ - local imagePath="$(pwd)/$imageName" - cd - >/dev/null && \ + eval export SLX_VM_PERSISTENT_PATH="${SLX_VM_PERSISTENT_PATH}" && \ + local imagePath="${SLX_VM_PERSISTENT_PATH}${imageName}" local persistentConfigVersionFilePath="$(mktemp --directory)/$(basename \ "$1")" && \ - "$(dirname "$0")/vmchooser-clc" -d -v "$1" \ + "$(dirname "$0")/vmchooser-clc" "$1" \ "$persistentConfigVersionFilePath" --create-persistent-config \ "$imagePath" && \ echo "$persistentConfigVersionFilePath" |