diff options
| author | Manuel Schneider | 2013-12-13 10:19:45 +0100 |
|---|---|---|
| committer | Manuel Schneider | 2013-12-13 10:19:45 +0100 |
| commit | d3eeda7d767e38c6a99bd6b9defa1cec6e7a733a (patch) | |
| tree | 7ca9f0d6628ac118e85c2e1f652c2fd1df0dcba5 /remote/modules/vmchooser/data | |
| parent | [cups] duplex on RZFARBE as standard (diff) | |
| parent | [vmchooser] Fix NFS fallback once again (diff) | |
| download | tm-scripts-d3eeda7d767e38c6a99bd6b9defa1cec6e7a733a.tar.gz tm-scripts-d3eeda7d767e38c6a99bd6b9defa1cec6e7a733a.tar.xz tm-scripts-d3eeda7d767e38c6a99bd6b9defa1cec6e7a733a.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmchooser/data')
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 4 |
1 files changed, 2 insertions, 2 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 43880a2c..2d6dfb41 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -485,8 +485,8 @@ else fi if [ -z "$vm_diskfile" ]; then - new_vmpath=$(ls "${vmpath}.r"* | grep -E '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -1) - [ -n "$new_vmpath" ] && vmpath="$vmpath$new_vmpath" + new_vmpath=$(ls "${vmpath}.r"* | grep -E -o '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -1) + [ -n "$new_vmpath" ] && vmpath="${vmpath}.r${new_vmpath}" vm_diskfile="$vmpath" fi |