[Qa-jenkins-scm] [jenkins.debian.net] 01/01: hurd: Use epiphany instead of iceweasel

[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 eca01f7e8e131af56c1135af1234e8fd66d1e8af
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Wed Jun 1 19:45:28 2016 +0200

    hurd: Use epiphany instead of iceweasel
---
 bin/g-i-installation.sh                            | 30 +++++++++++++++++++---
 .../debian_jessie_hurd_lxde_preseed.cfg            |  2 +-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 93e3bea..aba0a95 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -481,7 +481,15 @@ post_install_boot() {
 						;;
 					0210)	do_and_report key alt-f2
 						;;
-					0220)	do_and_report type "iceweasel"
+					0220)
+						case $NAME in
+							*_hurd*)
+								do_and_report type "epiphany"
+								;;
+							*)
+								do_and_report type "iceweasel"
+								;;
+						esac
 						;;
 					0230)	do_and_report key space
 						;;
@@ -529,7 +537,15 @@ post_install_boot() {
 		debian_*lxde)	case $TOKEN in
 					0200)	do_and_report key alt-f2
 						;;
-					0220)	do_and_report type "iceweasel"
+					0220)
+						case $NAME in
+							*_hurd*)
+								do_and_report type "epiphany"
+								;;
+							*)
+								do_and_report type "iceweasel"
+								;;
+						esac
 						;;
 					0230)	do_and_report key space
 						;;
@@ -631,7 +647,15 @@ post_install_boot() {
 						;;
 					0200)	do_and_report key alt-f2
 						;;
-					0210)	do_and_report type "iceweasel"
+					0220)
+						case $NAME in
+							*_hurd*)
+								do_and_report type "epiphany"
+								;;
+							*)
+								do_and_report type "iceweasel"
+								;;
+						esac
 						;;
 					0230)	do_and_report key space
 						;;
diff --git a/d-i-preseed-cfgs/debian_jessie_hurd_lxde_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_hurd_lxde_preseed.cfg
index d20e7e7..695f337 100644
--- a/d-i-preseed-cfgs/debian_jessie_hurd_lxde_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_jessie_hurd_lxde_preseed.cfg
@@ -369,7 +369,7 @@ d-i preseed/early_command string sed -ie s/tty4/com0/ /etc/inittab ; kill -HUP 1
 # directly, or use the apt-install and in-target commands to easily install
 # packages and run commands in the target system.
 #d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh
-d-i preseed/late_command string apt-install xdm; echo /usr/bin/xdm >/target/etc/X11/default-display-manager
+d-i preseed/late_command string apt-install xdm epiphany-browser ; echo /usr/bin/xdm >/target/etc/X11/default-display-manager
 
 # Alternatively, if you want to install to a location other than the mbr,
 # uncomment and edit these lines:

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