X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=094d303aebe7b080417a13a46557806dd2502fb5;hb=6eda88f2b9f3c0169e6879594e79e7e2adbbeafe;hp=aa611326f53f416a40ce38c24e08e45273a3be1f;hpb=8029faa7b9d8d991177c3989804caa797811cd30;p=grml-live-grml.git

diff --git a/buildd/functions.sh b/buildd/functions.sh
index aa61132..094d303 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -59,7 +59,7 @@ grml_live_run() {
   fi
 
   grml-live -F $* $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
-            -g $NAME -v $DATE -r grml-live-autobuild -i $ISO_NAME \
+            -g "$NAME-daily-$SUITE" -v $DATE -r grml-live-autobuild -i $ISO_NAME \
             1>/var/log/grml-buildd.stdout \
             2>/var/log/grml-buildd.stderr ; RC=$?
 
@@ -78,8 +78,8 @@ create_logs() {
 # store logs on remote server:
 upload_logs() {
   [ -n "$RSYNC_MIRROR" ] || return 1
-#  eval $(grep '^LOGDIR=' $FAI_LOGFILES/variables.log)
-  rsync --exclude dmesg.log --times --partial -az --quiet /var/log/grml-buildd.* \
+  umask 002
+  rsync --exclude dmesg.log --times --partial --copy-links -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):