From 72683a974b0d97c96edc393ad8f0dfff9de4ef5c Mon Sep 17 00:00:00 2001
From: thaibault
Date: Thu, 8 Aug 2013 18:46:12 +0200
Subject: Increase compatibility with different busybox versions.

---
 .../vmchooser/data/opt/openslx/scripts/vmchooser-clc       | 14 ++++++++++----
 .../data/opt/openslx/scripts/vmchooser-xml_filter          |  6 +++---
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-clc b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-clc
index a8cfbcf3..a70d46d8 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-clc
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-clc
@@ -341,10 +341,16 @@ EOF
         clcLog "Take a snapshot with name or uuid \"$_VIRTUAL_BOX_SNAPSHOT_NAME\"." && \
         VBoxManage snapshot tmp take "$_VIRTUAL_BOX_SNAPSHOT_NAME" \
             1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
+## unixBase
+##         local virtualBoxSnapshotUUID="$(basename \
+##             "${temporaryConfigurationPath}tmp/Snapshots/"*.vdi | sed \
+##             --regexp-extended 's/\{(.+)\}\..+/\1/g')" 1>"$_STANDARD_OUTPUT" \
+##             2>"$_ERROR_OUTPUT" && \
         local virtualBoxSnapshotUUID="$(basename \
             "${temporaryConfigurationPath}tmp/Snapshots/"*.vdi | sed \
-            --regexp-extended 's/\{(.+)\}\..+/\1/g')" 1>"$_STANDARD_OUTPUT" \
+            -r 's/\{(.+)\}\..+/\1/g')" 1>"$_STANDARD_OUTPUT" \
             2>"$_ERROR_OUTPUT" && \
+##
         echo "$virtualBoxSnapshotUUID" \
             1>"$_VIRTUAL_BOX_SNAPSHOT_UUID_FILE_PATH" 2>"$_ERROR_OUTPUT" && \
         clcLog "Created snapshot uuid is \"$virtualBoxSnapshotUUID\" (uuid saved to \"$_VIRTUAL_BOX_SNAPSHOT_UUID_FILE_PATH\")." && \
@@ -404,7 +410,7 @@ EOF
             1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
         clcLog 'Edit short description.' && \
 ## unixBase         sed --in-place --regexp-extended \
-        sed -ir \
+        sed -i -r \
             "s/(< *short_description[^>]*param=\"[^\"]*)(\")/\\1$_PERSISTENT_SHORT_DESCRIPTION_SUFFIX\\2/g" \
             "$_TARGET_PATH" 1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
         clcLog 'Append "original_xml_file_path" tag.' && \
@@ -414,7 +420,7 @@ EOF
 ##                 "$(readlink --canonicalize \
 ##                 "$_BASIC_IMAGE_CONFIGURATION_FILE_PATH")")\"\/>/g" \
 ##             "$_TARGET_PATH" 1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
-        sed -ir \
+        sed -i -r \
             "s/^([ \\t]*)(< *persistent[^>]+param=\"[^\"]+\"[^>]*>)/\\1\\2\\n\\1<original_xml_file_path param=\"$(clcValidateSEDReplacement \
                 "$(readlink -f \
                 "$_BASIC_IMAGE_CONFIGURATION_FILE_PATH")")\"\/>/g" \
@@ -422,7 +428,7 @@ EOF
 ##
         clcLog 'Edit image file path.' && \
 ## unixBase         sed --in-place --regexp-extended \
-        sed -ir \
+        sed -i -r \
             "s/(< *image_name[^>]*param=\")[^\"]*(\")/\\1$(clcValidateSEDReplacement \
             "$_PERSISTENT_CONFIG_TARGET")\\2/g" "$_TARGET_PATH" \
             1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT"
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 f327b5d9..1f6c5985 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
@@ -27,7 +27,7 @@
 #
 
 # include default directories
-. /etc/opt/openslx/openslx.conf
+. /opt/openslx/config
 
 if [ -f ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf ]; then
   . ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf
@@ -40,8 +40,8 @@ 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 >/dev/null && \
-    local imagePath="$(pwd)/.persistentMachineSnapshots/$imageName"
+    cd "$SLX_VM_PERSISTENT_PATH" >/dev/null && \
+    local imagePath="$(pwd)/$imageName"
     cd - >/dev/null && \
     local persistentConfigVersionFilePath="$(mktemp --directory)/$(basename \
         "$1")" && \
-- 
cgit v1.2.3-55-g7522