From c3d3e33f6ca724738e8e5b3d036df92535b94318 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 20 Nov 2013 14:48:09 +0100
Subject: [vmchooser] Introduce prio dnbd3 servers

---
 .../vmchooser/data/opt/openslx/scripts/vmchooser-run_virt      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'remote/modules')

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 2c48218c..4396ffaa 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -470,17 +470,17 @@ 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" -a "x$SLX_VM_DNBD3" = "xyes" ]; then
+if [ -n "$SLX_DNBD3_SERVERS" -o -n "$SLX_DNBD3_PRIO_SERVERS" ] && [ "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]+ //')
-		for SRV in $TMP_SERVERS; do
+		[ -n "$SLX_DNBD3_SERVERS" ] && TMP_SERVERS=$(for SRV in $SLX_DNBD3_SERVERS; do echo "$RANDOM $SRV"; done | sort -u | sed -r 's/^[0-9]+ //')
+		for SRV in $SLX_DNBD3_PRIO_SERVERS $TMP_SERVERS; do
 			dnbd3=$(dnbd3-client -h "$SRV" -i "${vmpath#/mnt/vmstore/}" -r 0)
 			RET=$?
 			if [ "$RET" = "0" ]; then
-				vm_diskfile="$dnbd3"
 				vm_revision=$(cat "/sys/block/${dnbd3#/dev/}/net/rid")
 				writelog "DNBD3: $vm_diskfile on $dnbd3 with rid $vm_revision"
+				vm_diskfile="$dnbd3"
 				break
 			fi
 		done
@@ -503,7 +503,7 @@ fi
 self="${xmlvirt}"
 . "/opt/openslx/etc/${xmlvirt}/run-virt.include" || writelog "Erroneous run-virt.include for $xmlvirt"
 # start a windowmanager for easier handling
-# (expect problems /w windows opening in background /w vmware without wm)
+# (expect problems w/ windows opening in background w/ vmware without wm)
 for dm in twm xfwm4 metacity openbox blackbox kwin fvwm2 ; do
 	if which $dm >/dev/null 2>&1 ; then
 		if [ "$dm" = "fvwm2" ] ; then
-- 
cgit v1.2.3-55-g7522