summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-11-11 15:34:37 +0100
committerHolger Levsen <holger@layer-acht.org>2014-11-11 15:34:37 +0100
commit3b906b8e56a82aa9d5477f166b9ee6ca6adcb9a1 (patch)
tree77a657cd77adf2ac3bcd7e03925fa1056353d8b7 /bin
parent6c1e094870b5d0cac534c7ec689c9ee9d13bc5e3 (diff)
downloadjenkins.debian.net-3b906b8e56a82aa9d5477f166b9ee6ca6adcb9a1.tar.xz
g-i: hurd: add '-machine kernel_irqchip=pff' to qemu params. thanks to Samuel Thibault for the patch.
Diffstat (limited to 'bin')
-rw-r--r--bin/g-i-installation.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 6fa1495c..211f315f 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -278,7 +278,7 @@ bootstrap_system() {
if [ -n "$QEMU_KERNEL" ]; then
echo -n "$QEMU_KERNEL " >> $QEMU_LAUNCHER
else # 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
+ 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
fi
echo "--append \"$APPEND\"" >> $QEMU_LAUNCHER
set -x