From ffc2a08a51120089e6b4a0090bf5ad43c5986afb Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 11 Nov 2014 20:52:34 +0100
Subject: g-i hurd: run the installer in qemu-in-KVM too

---
 bin/g-i-installation.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'bin/g-i-installation.sh')

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index cb7a3195..fb8630df 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -183,7 +183,12 @@ bootstrap_system() {
 	sudo qemu-img create -f raw $LV ${DISKSIZE_IN_GB}G
 	echo "Doing g-i installation test for $NAME now."
 	# qemu related variables (incl kernel+initrd) - display first, as we grep for this in the process list
-	QEMU_OPTS="-display vnc=$DISPLAY -enable-kvm -cpu host"
+	QEMU_OPTS="-display vnc=$DISPLAY"
+	case $NAME in
+		# nested KVM runs gnumach horribly slowly
+		*_hurd*)	;;
+		*)		QEMU_OPTS="$QEMU_OPTS -enable-kvm -cpu host" ;;
+	esac
 	if [ -n "$IMAGE" ] ; then
 		QEMU_OPTS="$QEMU_OPTS -cdrom $IMAGE -boot d"
 	        case $NAME in
-- 
cgit v1.2.3-70-g09d2