diff options
| author | Simon Rettberg | 2013-10-17 13:41:39 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-10-17 13:41:39 +0200 |
| commit | d76d6d7b30013c603d46d3737fbfeced2ba71c03 (patch) | |
| tree | 993f330f81e8c1e249dfb25131a99ee2f485c05a | |
| parent | Merge branch 'master' of dnbd3:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-d76d6d7b30013c603d46d3737fbfeced2ba71c03.tar.gz tm-scripts-d76d6d7b30013c603d46d3737fbfeced2ba71c03.tar.xz tm-scripts-d76d6d7b30013c603d46d3737fbfeced2ba71c03.zip | |
[vmchooser] only use dnbd3 for vms if config says SLX_VM_DNBD3=yes
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 2 |
1 files changed, 1 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 ec860b3c..261ef8f5 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -451,7 +451,7 @@ cp "/opt/openslx/etc/vmchooser/openslx.exe" "/opt/openslx/etc/vmchooser/fd-loop/ unset vm_diskfile unset vm_revision unset dnbd3 -if [ -n "$SLX_DNBD3_SERVERS" ]; then +if [ -n "$SLX_DNBD3_SERVERS" -a "x$SLX_VM_DNBD3" = "xyes" ]; then if [ -e "/dev/dnbd0" -a -e "/var/run/dnbd3.socket" ]; then # Shuffle server list TMP_SERVERS=$(for SRV in $SLX_DNBD3_SERVERS; do echo "$RANDOM $SRV"; done | sort -u | sed -r 's/^[0-9]+ //') |