diff options
| -rwxr-xr-x | bin/g-i-installation.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 9cf5828a..6ddd6d09 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -336,7 +336,11 @@ bootstrap_system() { case $NAME in *_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/exec.static \$(exec-task=task-create)" ' >> $QEMU_LAUNCHER + case $NAME in + *_jessie_hurd*) EXEC="/boot/kernel/ld.so.1 /hurd/exec" ;; + *_hurd*) EXEC="/boot/kernel/exec.static" ;; + esac + 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"$EXEC"' \$(exec-task=task-create)" ' >> $QEMU_LAUNCHER APPEND="console=com0 $APPEND" ;; *) ;; |