From 1cfc67c8d70f0915fbd72175de8eb084187456f3 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 23 Oct 2014 22:03:02 +0200 Subject: g-i-installation: better debug output and fix a key-stroke for debian-edu main-servers --- bin/g-i-installation.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index bac5c41d..c175a6ff 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -50,6 +50,11 @@ WORKSPACE=$(pwd) RESULTS=$WORKSPACE/results mkdir -p $RESULTS/log +# +# set main counter +# +NR=0 + # # language # @@ -119,7 +124,11 @@ cleanup_all() { # case $NAME in *_rescue*) ;; - *) save_logs + *) if [ $NR -gt 200 ] ; then + save_logs + else + echo "Not trying to get logs." + fi ;; esac } @@ -669,7 +678,7 @@ post_install_boot() { ;; 1120) do_and_report type https ;; - 1125) do_and_report key ":" + 1125) do_and_report key ":" # this will get a : ;; 1130) do_and_report type "//www" ;; @@ -687,11 +696,11 @@ post_install_boot() { ;; 1370) do_and_report type https ;; - 1375) do_and_report key ":" + 1375) do_and_report key ";" # this will get a : ;; 1380) do_and_report type "//www" ;; - 1385) do_and_report key ":" + 1385) do_and_report key ";" # this will get a : ;; 1390) do_and_report type "631" ;; @@ -1117,7 +1126,6 @@ fi # # run g-i # -NR=0 bootstrap_system set +x case $NAME in -- cgit v1.2.3-70-g09d2