summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-06-14 11:30:45 +0200
committerHolger Levsen <holger@layer-acht.org>2013-06-14 11:30:45 +0200
commit88de582a8a0a136632d0cb040a30b4d01ed8fa27 (patch)
tree500ea5739ba43055a11bd353c73a7f95ca006dcf /bin
parenta692a17399104d8b82dca05e69a38d57862ccac3 (diff)
downloadjenkins.debian.net-88de582a8a0a136632d0cb040a30b4d01ed8fa27.tar.xz
g-i edu: add new wheezy-test standalone_(gnome|xfce|lxde) tests
Diffstat (limited to 'bin')
-rwxr-xr-xbin/g-i-installation.sh26
1 files changed, 22 insertions, 4 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 81c6597b..9ff67026 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -179,12 +179,30 @@ bootstrap_system() {
*_dark_theme)
EXTRA_APPEND="$EXTRA_APPEND theme=dark"
;;
+ debian-edu_*_gnome)
+ EXTRA_APPEND="$EXTRA_APPEND desktop=gnome"
+ GUITERMINAL=xterm
+ ;;
+ debian-edu_*_lxde)
+ EXTRA_APPEND="$EXTRA_APPEND desktop=lxde"
+ GUITERMINAL=xterm
+ ;;
+ debian-edu_*_xfce)
+ EXTRA_APPEND="$EXTRA_APPEND desktop=xfce"
+ GUITERMINAL=xterm
+ ;;
debian-edu_*)
- EXTRA_APPEND="$EXTRA_APPEND desktop=kde DEBCONF_DEBUG=developer" # FIXME: this shall become more conditional...
+ EXTRA_APPEND="$EXTRA_APPEND desktop=kde"
+ GUITERMINAL=konsole
;;
*) ;;
esac
case $NAME in
+ debian-edu_*)
+ EXTRA_APPEND="$EXTRA_APPEND DEBCONF_DEBUG=developer" # FIXME: this shall become more conditional...
+ ;;
+ esac
+ case $NAME in
debian-edu_*)
# Debian Edu and tasksel do not work the expected way
# with priority=critical, so do not set it.
@@ -655,7 +673,7 @@ post_install_boot() {
*) ;;
esac
;;
- debian-edu*standalone) case $TOKEN in
+ debian-edu*standalone*) case $TOKEN in
# debian-edu installations report error found during installation, go forward
0100) do_and_report key enter
;;
@@ -673,7 +691,7 @@ post_install_boot() {
;;
0400) do_and_report key alt-f2
;;
- 0410) do_and_report type "konqueror"
+ 0410) do_and_report type "iceweasel"
;;
0420) do_and_report key space
;;
@@ -691,7 +709,7 @@ post_install_boot() {
;;
0600) do_and_report key alt-f2
;;
- 0610) do_and_report type konsole
+ 0610) do_and_report type $GUITERMINAL
;;
0620) do_and_report key enter
;;