summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bin/g-i-installation.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 1dcd5c0c..a9e8e0cd 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -277,8 +277,14 @@ bootstrap_system() {
echo -n "sudo qemu-system-x86_64 $QEMU_OPTS " >> $QEMU_LAUNCHER
if [ -n "$QEMU_KERNEL" ]; then
echo -n "$QEMU_KERNEL " >> $QEMU_LAUNCHER
- else # 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
+ else
+ 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
+ ;;
+ *) ;;
+ esac
fi
echo "--append \"$APPEND\"" >> $QEMU_LAUNCHER
set -x