[Qa-jenkins-scm] [jenkins.debian.net] 02/02: g-i: support kfreebsd*_$desktop suffixes

Holger Levsen holger at moszumanska.debian.org
Sat May 2 15:57:29 UTC 2015


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 3f3c73b5f84cd8887218674f9a0873cfc9e32fe9
Author: Steven Chamberlain <steven at pyro.eu.org>
Date:   Sat May 2 15:52:04 2015 +0100

    g-i: support kfreebsd*_$desktop suffixes
---
 bin/g-i-installation.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 533288d..47a2b0f 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -330,7 +330,7 @@ bootstrap_system() {
 		echo -n "$QEMU_KERNEL " >> $QEMU_LAUNCHER
 	else
 	        case $NAME in
-			*_kfreebsd)	;;
+			*_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/ld.so.1 /hurd/exec \$(exec-task=task-create)" ' >> $QEMU_LAUNCHER
 					APPEND="console=com0 $APPEND"
@@ -339,7 +339,7 @@ bootstrap_system() {
 		esac
 	fi
 	case $NAME in
-		*_kfreebsd)	# not supported for the --append option
+		*_kfreebsd*)	# not supported for the --append option
 				;;
 		*)		echo "--append \"$APPEND\"" >> $QEMU_LAUNCHER
 				;;

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



More information about the Qa-jenkins-scm mailing list