diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-06-01 19:45:28 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-06-02 00:09:25 +0200 |
| commit | eca01f7e8e131af56c1135af1234e8fd66d1e8af (patch) | |
| tree | 02df125e4d258220e96a80027d89710278592eec | |
| parent | dfd4f368ef0ba00d6142714372463b150e10b459 (diff) | |
| download | jenkins.debian.net-eca01f7e8e131af56c1135af1234e8fd66d1e8af.tar.xz | |
hurd: Use epiphany instead of iceweasel
| -rwxr-xr-x | bin/g-i-installation.sh | 30 | ||||
| -rw-r--r-- | d-i-preseed-cfgs/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 93e3beab..aba0a951 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 d20e7e7a..695f337b 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: |