X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=226b372ead475ca0c6943e46a90c19b11366e9f0;hp=08d2661f6cf7ae3f736fa5161f58331a0a21416a;hb=e4040d5c109eedf9316190a415fe7bc90c0e30dc;hpb=6decb9b013be4c016fa61afbf86655c8b7afc734

diff --git a/buildd/functions.sh b/buildd/functions.sh
index 08d2661..226b372 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -1,10 +1,8 @@
-#!/bin/sh
 # Filename:      /usr/share/grml-live/buildd/functions.sh
 # Purpose:       main function file for grml-live buildd
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # 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() {
@@ -25,10 +23,10 @@ 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)"
+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"
 
@@ -36,7 +34,7 @@ MUTT_HEADERS=$(mktemp)
 [ -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 "$ATTACHMENT" ]    || ATTACHMENT="$TMP_DIR/grml-live-logs_$DATE.tar.gz"
 [ -n "$FROM" ]          || FROM=root@localhost
 
 if [ -n "$LOGFILE" ] ; then
@@ -58,8 +56,20 @@ 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 \
+  # 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   ;;
+    lenny)    CODENAME=lenny ;;
+    etch)     CODENAME=etch  ;;
+  esac
+
+  grml_name="$NAME-daily-$CODENAME"
+  shortdate="$(date +%y%m%d)"
+
+  grml-live -F $* $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
+            -g "$grml_name" -v "$shortdate" -r grml-live-autobuild -i $ISO_NAME \
             1>/var/log/grml-buildd.stdout \
             2>/var/log/grml-buildd.stderr ; RC=$?
 
@@ -72,14 +82,14 @@ grml_live_run() {
 
 # 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 1>/dev/null )
 }
 
 # store logs on remote server:
 upload_logs() {
   [ -n "$RSYNC_MIRROR" ] || return 1
-#  eval $(grep '^LOGDIR=' $FAI_LOGFILES/variables.log)
-  rsync --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}"/
 }
 
@@ -94,6 +104,8 @@ iso_details() {
 
 # send status mail:
 send_mail() {
+  # create logs only 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 +115,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,15 +135,24 @@ The following packages could not be installed:
 
 $(grep -i "Couldn't find.*package" $FAI_LOGFILES/software.log | sed 's/\(.*\)"\(.*\)"\(.*\)/\2/' | sort -u || echo "* nothing")
 
+See attached files:
+/var/log/grml-buildd.stderr /var/log/grml-buildd.stdout $ATTACHMENT
+
 EOF " | \
-  mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" $MUTT_ATTACH "$RECIPIENT"
+  mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" -a /var/log/grml-buildd.stderr -a /var/log/grml-buildd.stdout $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
 }