diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-11 20:52:34 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-11-11 20:56:00 +0100 |
| commit | ffc2a08a51120089e6b4a0090bf5ad43c5986afb (patch) | |
| tree | 6578069324d62be1a96227e3b1e0d34cac133af9 /bin | |
| parent | 900b91ee2ddf1d7122405d2582587ed35565746b (diff) | |
| download | jenkins.debian.net-ffc2a08a51120089e6b4a0090bf5ad43c5986afb.tar.xz | |
g-i hurd: run the installer in qemu-in-KVM too
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/g-i-installation.sh | 7 |
1 files changed, 6 insertions, 1 deletions
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 |