diff options
| author | Jonathan Bauer | 2014-10-31 16:06:25 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-10-31 16:06:25 +0100 |
| commit | be3d683dad0c368d3d6cd29692b687b9cc9f82c1 (patch) | |
| tree | 97fcdd12b8a094499e0ae94ec1eab834d8057168 | |
| parent | [pam] added support for .d folders containing hook scripts (diff) | |
| download | tm-scripts-be3d683dad0c368d3d6cd29692b687b9cc9f82c1.tar.gz tm-scripts-be3d683dad0c368d3d6cd29692b687b9cc9f82c1.tar.xz tm-scripts-be3d683dad0c368d3d6cd29692b687b9cc9f82c1.zip | |
[vmchooser] fix funny variables
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 1 | ||||
| -rwxr-xr-x | remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt | 1 |
2 files changed, 2 insertions, 0 deletions
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 |