summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-02-09 14:47:25 +0100
committerHolger Levsen <holger@layer-acht.org>2013-02-09 14:47:25 +0100
commitb60aa0a273fcde2008b6225b3e5ce98a29e369f4 (patch)
treed4d1a016cb3af3042137729f66e29ca330e92b89
parentda00c5a6eebb92c505a897bdeb2d219bc7a4f262 (diff)
downloadjenkins.debian.net-b60aa0a273fcde2008b6225b3e5ce98a29e369f4.tar.xz
do root login on minimal edu installations
-rwxr-xr-xbin/g-i-installation.sh38
1 files changed, 28 insertions, 10 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 8dbf6097..271da6cb 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -270,17 +270,33 @@ normal_action() {
let MY_NR=NR-TRIGGER_NR
TOKEN=$(printf "%03d" $MY_NR)
#
- # common for all types of install
+ # login as jenkins or root
#
- case $TOKEN in
- 050) do_and_report type jenkins
- ;;
- 060) do_and_report key enter
- ;;
- 070) do_and_report type insecure
- ;;
- 080) do_and_report key enter
- ;;
+ case $NAME in
+ debian_*) case $TOKEN in
+ 050) do_and_report type jenkins
+ ;;
+ 060) do_and_report key enter
+ ;;
+ 070) do_and_report type insecure
+ ;;
+ 080) do_and_report key enter
+ ;;
+ *) ;;
+ esac
+ ;;
+ debian-edu_*minimal) case $TOKEN in
+ 050) do_and_report type root
+ ;;
+ 060) do_and_report key enter
+ ;;
+ 070) do_and_report type r00tme
+ ;;
+ 080) do_and_report key enter
+ ;;
+ *) ;;
+ esac
+ ;;
*) ;;
esac
#
@@ -493,6 +509,8 @@ normal_action() {
# debian-edu*minimal installations result in text mode, thus needing an extra tab
030) do_and_report key tab
;;
+ 040) do_and_report key enter
+ ;;
*) ;;
esac
;;