From 5f91d53541f45754fe3b0691ae7b09cc5bddbd3a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 26 Aug 2013 19:16:46 +0200
Subject: [vmchooser] Shuffle dnbd3 server list

---
 remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(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 f6e4e491..7e594747 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -439,7 +439,9 @@ unset vm_revision
 unset dnbd3
 if [ -n "$SLX_DNBD3_SERVERS" ]; then
 	if [ -e "/dev/dnbd0" -a -e "/var/run/dnbd3.socket" ]; then
-		for SRV in $SLX_DNBD3_SERVERS; do
+		# 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
 			dnbd3=$(dnbd3-client -h "$SRV" -i "${vmpath#/mnt/vmstore/}" -r 0)
 			RET=$?
 			if [ "$RET" = "0" ]; then
-- 
cgit v1.2.3-55-g7522


From 7a3c63170aeada044f920331e65179368a4b20c4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 26 Aug 2013 19:32:57 +0200
Subject: [kernel] copy kernel to build dir

---
 remote/modules/kernel/kernel.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/kernel/kernel.build b/remote/modules/kernel/kernel.build
index 99ee36a2..39077111 100644
--- a/remote/modules/kernel/kernel.build
+++ b/remote/modules/kernel/kernel.build
@@ -75,7 +75,7 @@ build() {
 }
 
 post_copy() {
-	:
+	cp -a "$MODULE_BUILD_DIR/kernel" "$TARGET_BUILD_DIR/../kernel/kernel" || perror "could not copy kernel to remote build dir"
 }
 
 # helper function to update the current kernel config with our parameters
-- 
cgit v1.2.3-55-g7522