diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-11-11 18:24:51 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-11-11 18:24:51 +0100 |
| commit | 900b91ee2ddf1d7122405d2582587ed35565746b (patch) | |
| tree | 57098a0dde0ae9ae4ec8469f70c30368efd78d53 | |
| parent | 159027597984f6abcac6d2464bd38f01deee7308 (diff) | |
| download | jenkins.debian.net-900b91ee2ddf1d7122405d2582587ed35565746b.tar.xz | |
g-i hurd: run hurd as qemu-in-KVM which for gnumarch is faster than KVM-in-KVM - thanks for Samuel Thibault for the patch
| -rw-r--r-- | bin/g-i-installation.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index a9e8e0cd..cb7a3195 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -281,7 +281,7 @@ bootstrap_system() { case $NAME in *_kfreebsd) ;; *_hurd*) # Hurd needs multiboot options jenkins can't escape correctly - echo -n '-machine kernel_irqchip=off --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 + 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 ;; *) ;; esac @@ -296,7 +296,12 @@ boot_system() { cd $WORKSPACE echo "Booting system installed with g-i installation test for $NAME." # 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 echo "Checking $LV:" FILE=$(sudo file -Ls $LV) if [ $(echo $FILE | grep -E '(x86 boot sector|DOS/MBR boot sector)' | wc -l) -eq 0 ] ; then |