diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-12-16 11:33:07 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-12-16 11:39:51 +0100 |
| commit | 57a1d8b8dfadd8b432e6d0c2d9dd3a8fabb62095 (patch) | |
| tree | 252a3faf7baeddecc5b48111675aeee5234520e1 /bin | |
| parent | db25777a302c07b79dc0e9536a70bc256dc8aea0 (diff) | |
| download | jenkins.debian.net-57a1d8b8dfadd8b432e6d0c2d9dd3a8fabb62095.tar.xz | |
g-i hurd: Re-enable kvm
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/g-i-installation.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index c3d90326..33aca327 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -197,12 +197,7 @@ 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" - case $NAME in - # nested KVM runs gnumach horribly slowly - *_hurd*) ;; - *) QEMU_OPTS="$QEMU_OPTS -enable-kvm -cpu host" ;; - esac + QEMU_OPTS="-display vnc=$DISPLAY -enable-kvm -cpu host" QEMU_WEBSERVER=http://10.0.2.1/ QEMU_NET_OPTS="-net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254" # preseeding related variables @@ -344,11 +339,6 @@ bootstrap_system() { *_kfreebsd) ;; *_hurd*) # Hurd needs multiboot options jenkins can't escape correctly echo -n '--kernel '$WORKSPACE'/gnumach --initrd "'$IMAGE_MNT'/boot/initrd.gz \$(ramdisk-create),'$IMAGE_MNT'/boot/kernel/ext2fs.static --multiboot-command-line=\${kernel-command-line} --host-priv-port=\${host-port} --device-master-port=\${device-port} --exec-server-task=\${exec-task} -T typed gunzip:device:rd0 \$(task-create) \$(task-resume),'$IMAGE_MNT'/boot/kernel/ld.so.1 /hurd/exec \$(exec-task=task-create)" ' >> $QEMU_LAUNCHER - # The slow qemu emulation brings IRQ - # timeouts, so rather avoid them - # completely, in qemu PIO is actually - # not slower than DMA anyway. - APPEND="hd0=nodma console=com0 $APPEND" ;; *) ;; esac |