X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=aa611326f53f416a40ce38c24e08e45273a3be1f;hb=1e4a57b1978dcc7ae5506e016920f8d8c3d8070d;hp=08d2661f6cf7ae3f736fa5161f58331a0a21416a;hpb=6decb9b013be4c016fa61afbf86655c8b7afc734;p=grml-live.git diff --git a/buildd/functions.sh b/buildd/functions.sh index 08d2661..aa61132 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=$? @@ -79,7 +79,7 @@ create_logs() { upload_logs() { [ -n "$RSYNC_MIRROR" ] || return 1 # eval $(grep '^LOGDIR=' $FAI_LOGFILES/variables.log) - rsync --times --partial -az --quiet /var/log/grml-buildd.* \ + rsync --exclude dmesg.log --times --partial -az --quiet /var/log/grml-buildd.* \ $FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/ } @@ -129,7 +129,10 @@ EOF " | \ store_iso() { if [ "$RC" = "0" ] ; then [ -d "$ISO_DIR" ] || mkdir "$ISO_DIR" - mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR + mv "${OUTPUT_DIR}/grml_isos/${ISO_NAME}" "$ISO_DIR" + if [ -r "${OUTPUT_DIR}/grml_isos/${ISO_NAME}.md5" ] ; then + mv "${OUTPUT_DIR}/grml_isos/${ISO_NAME}.md5" "${ISO_DIR}" + fi fi }