From d76d6d7b30013c603d46d3737fbfeced2ba71c03 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 17 Oct 2013 13:41:39 +0200
Subject: [vmchooser] only use dnbd3 for vms if config says SLX_VM_DNBD3=yes

---
 remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote')

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]+ //')
-- 
cgit v1.2.3-55-g7522