X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=1db5a41943c95fa0ed643968767f62e850b05a91;hp=6ea37cdbf2e04c70d1754fbb4997ba3dd649f7e6;hb=4d1178f7de7bb4da7a26979da47ce11ab1ccc1b2;hpb=8766b1819bbb0cbb9d6fd7464637fb1caa443f20 diff --git a/buildd/functions.sh b/buildd/functions.sh index 6ea37cd..1db5a41 100755 --- a/buildd/functions.sh +++ b/buildd/functions.sh @@ -1,10 +1,9 @@ -#!/bin/sh +#!/bin/bash # Filename: /usr/share/grml-live/buildd/functions.sh # Purpose: main function file for grml-live buildd # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Dec 09 18:38:26 CET 2007 [mika] ################################################################################ die() { @@ -14,7 +13,7 @@ die() { . /etc/grml/grml-buildd.conf || die "Could not source /etc/grml/grml-buildd.conf. Exiting." -type -p mutt 1>/dev/null 2>&1 || die "mutt binary not found. Exiting." +which mutt >/dev/null 2>&1 || die "mutt binary not found. Exiting." # exit if important variables aren't set: [ -n "$STORAGE" ] || die "\$STORAGE is not set. Exiting." @@ -25,19 +24,19 @@ type -p mutt 1>/dev/null 2>&1 || die "mutt binary not found. Exiting." # some defaults: PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11 -DATE=$(date +%Y%m%d) -TMP_DIR=$(mktemp -d) -MUTT_HEADERS=$(mktemp) -[ -n "$TMP_DIR" ] || die "Could not create \$TMP_DIR. Exiting." +DATE=$(date +'%Y%m%d_%H%M%S') +TMP_DIR="$(mktemp -d)" +MUTT_HEADERS="$(mktemp)" +[ -n "$TMP_DIR" ] || die "Could not create \$TMP_DIR. Exiting." [ -n "$MUTT_HEADERS" ] || die "Could not create $\MUTT_HEADERS. Exiting." -[ -n "$ARCH" ] && GRML_LIVE_ARCH="-a $ARCH" # make sure we have same safe defaults: [ -n "$OUTPUT_DIR" ] || OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$" [ -n "$ISO_DIR" ] || ISO_DIR=$STORAGE/grml-isos [ -n "$RECIPIENT" ] || RECIPIENT=root@localhost -[ -n "$ATTACHMENT" ] || ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz [ -n "$FROM" ] || FROM=root@localhost +[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)" +ATTACHMENT="$TMP_DIR/grml-live-logs_$DATE.tar.gz" if [ -n "$LOGFILE" ] ; then GRML_LOGFILE="$LOGFILE" @@ -46,7 +45,6 @@ else fi [ -n "$FAI_LOGFILES" ] || FAI_LOGFILES=/var/log/fai/grml/last - echo "my_hdr From: grml-live autobuild daemon <$FROM>" > $MUTT_HEADERS # execute grml-live: @@ -58,28 +56,41 @@ grml_live_run() { fi 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 \ - 1>/var/log/grml-buildd.stdout \ + # workaround the 32 chars limit of mkisofs -V .... + # 'grml64-small-daily-squeeze 090223' is too long + case $SUITE in + sid) CODENAME=sid ;; + squeeze) CODENAME=squ ;; + wheezy) CODENAME=wheez ;; + lenny) CODENAME=lenny ;; + etch) CODENAME=etch ;; + esac + + grml_name="$NAME-daily-$CODENAME" + shortdate="$(date +%y%m%d)" + + grml-live -F $* -a $ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \ + -g "$grml_name" -v "$shortdate" -r grml-live-autobuild -i $ISO_NAME \ + >/var/log/grml-buildd.stdout \ 2>/var/log/grml-buildd.stderr ; RC=$? if [ "$RC" = "0" ] ; then RC_INFO=success else RC_INFO=error + return 1 fi } # create log archive: create_logs() { - ( cd / && tar zcf $ATTACHMENT $FAI_LOGFILES $GRML_LOGFILE 1>/dev/null ) + ( cd / && tar zcf $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.stderr /var/log/grml-buildd.stdout $GRML_LOGFILE >/dev/null ) } # 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.* \ + rsync --exclude dmesg.log --times --partial --copy-links -rltDz --quiet /var/log/grml-buildd.* \ $FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/ } @@ -94,6 +105,9 @@ iso_details() { # send status mail: send_mail() { + # create logs if using 'send_mail -e' + [ "$1" = "-e" ] && create_logs + # attach logs only if we have some: [ -r "$ATTACHMENT" ] && MUTT_ATTACH="-a $ATTACHMENT" || MUTT_ATTACH='' @@ -103,7 +117,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): @@ -121,24 +137,33 @@ The following packages could not be installed: $(grep -i "Couldn't find.*package" $FAI_LOGFILES/software.log | sed 's/\(.*\)"\(.*\)"\(.*\)/\2/' | sort -u || echo "* nothing") -EOF " | \ - mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" $MUTT_ATTACH "$RECIPIENT" +See attached files: +/var/log/grml-buildd.stderr $ATTACHMENT + +EOF" | \ + mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" -a /var/log/grml-buildd.stderr $MUTT_ATTACH -- "$RECIPIENT" } # make sure we store the final iso: 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 + if [ -r "${OUTPUT_DIR}/grml_isos/${ISO_NAME}.sha1" ] ; then + mv "${OUTPUT_DIR}/grml_isos/${ISO_NAME}.sha1" "${ISO_DIR}" + fi fi } # allow clean exit: bailout() { if [ "$RC" = "0" ] ; then - rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR" + rm -rf "$ATTACHMENT" "$TMP_DIR" "$OUTPUT_DIR" "$MUTT_HEADERS" else - rm -f "$MUTT_HEADERS" + rm -f "$ATTACHMENT" "$MUTT_HEADERS" echo "building ISO failed, keeping build files [${OUTPUT_DIR} / ${TMP_DIR}]">&2 fi