[Qa-jenkins-scm] [jenkins.debian.net] 01/01: g-i: Fix accessing exec in Jessie Hurd

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 6a2de59f510ba37ae4f246d7943f12f6049d5f9d
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Fri Nov 4 01:45:23 2016 +0100

    g-i: Fix accessing exec in Jessie Hurd
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/g-i-installation.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 9cf5828..6ddd6d0 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"
 					;;
 			*)		;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git