diff options
| author | Christian Rößler | 2013-11-22 18:19:44 +0100 |
|---|---|---|
| committer | Christian Rößler | 2013-11-22 18:19:44 +0100 |
| commit | 7e259d8018de9a6785dc96f42995e3ba52732db4 (patch) | |
| tree | 27b35678e27d4cba302c7d15294c3b486d46a7df | |
| parent | [doc] setup_howto further elaborated: Stage4, div. enhancements. (diff) | |
| parent | [vmchooser] run-virt backwards compatibility for NFS usage (diff) | |
| download | tm-scripts-7e259d8018de9a6785dc96f42995e3ba52732db4.tar.gz tm-scripts-7e259d8018de9a6785dc96f42995e3ba52732db4.tar.xz tm-scripts-7e259d8018de9a6785dc96f42995e3ba52732db4.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 3 |
1 files changed, 2 insertions, 1 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 eb284192..5cb23f00 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -489,7 +489,8 @@ else fi if [ -z "$vm_diskfile" ]; then - vmpath=$(ls "${vmpath}.r"* | grep -E '\.r[0-9]+$' | sort --version-sort | tail -1) + new_vmpath=$(ls "${vmpath}.r"* | grep -E '\.r[0-9]+$' | sort --version-sort | tail -1) + [ -n "$new_vmpath" ] && vmpath="$new_vmpath" vm_diskfile="$vmpath" fi |