diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-11-04 01:45:23 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-11-04 10:41:59 +0100 |
| commit | 6a2de59f510ba37ae4f246d7943f12f6049d5f9d (patch) | |
| tree | 360aab0d6cac6fd8abffc2f7c5b038a6850cc413 /bin | |
| parent | 3e859c4e3a28472d25a46a77dcb0fedce3061693 (diff) | |
| download | jenkins.debian.net-6a2de59f510ba37ae4f246d7943f12f6049d5f9d.tar.xz | |
g-i: Fix accessing exec in Jessie Hurd
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin')
| -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" ;; *) ;; |