X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=471a126392e61b6bd409b1f17f1c920a880a9d2f;hp=ebfc88870dec46c9337c2d52167dd5b635094615;hb=9bba4f868d5cbdde2f358cb156941331655752eb;hpb=89064c9e3cded3beb72f98a2722fcaa6f6fa3e78

diff --git a/buildd/functions.sh b/buildd/functions.sh
index ebfc888..471a126 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -58,7 +58,7 @@ grml_live_run() {
      fi
   fi
 
-  grml-live -F $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
+  grml-live -F $* $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
             -g $NAME -v $DATE -r grml-live-autobuild -i $ISO_NAME \
             1>/var/log/grml-buildd.stdout \
             2>/var/log/grml-buildd.stderr ; RC=$?
@@ -78,7 +78,7 @@ create_logs() {
 # store logs on remote server:
 upload_logs() {
   [ -n "$RSYNC_MIRROR" ] || return 1
-#  eval $(grep '^LOGDIR=' $FAI_LOGFILES/variables.log)
+  umask 022
   rsync --exclude dmesg.log --times --partial -az --quiet /var/log/grml-buildd.* \
   $FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/
 }
@@ -103,7 +103,9 @@ $ISO_DETAILS
 
 Return code of grml-live run was: $RC
 
-$(grep 'Executed command line:' $GRML_LOGFILE || echo "* executed command line not available")
+$(grep -A2 'Executed grml-live' $GRML_LOGFILE || echo "* executed grml-live command line not available")
+
+$(grep -A2 'Executed FAI' $GRML_LOGFILE || echo "* executed FAI command line not available")
 
 The following errors have been noticed (several might be warnings only):