From: Michael Prokop <devnull@localhost>
Date: Sat, 13 Oct 2007 08:35:49 +0000 (+0200)
Subject: Merge branches
X-Git-Tag: 0.0.5~15
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=a49504d976dc57d6c50be3a632a98acacdac962d;hp=551eb6fc403775cd139742dcf31b7feca9c2e49c

Merge branches
---

diff --git a/buildd/grml-live_autobuild_grml-large_etch.sh b/buildd/grml-live_autobuild_grml-large_etch.sh
index 73ee091..dcf67ac 100755
--- a/buildd/grml-live_autobuild_grml-large_etch.sh
+++ b/buildd/grml-live_autobuild_grml-large_etch.sh
@@ -36,7 +36,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml-large_etch.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml-large_sid.sh b/buildd/grml-live_autobuild_grml-large_sid.sh
index a9f9693..3aa1c60 100755
--- a/buildd/grml-live_autobuild_grml-large_sid.sh
+++ b/buildd/grml-live_autobuild_grml-large_sid.sh
@@ -36,7 +36,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml-large_sid.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml-medium_etch.sh b/buildd/grml-live_autobuild_grml-medium_etch.sh
index 6698584..7988462 100755
--- a/buildd/grml-live_autobuild_grml-medium_etch.sh
+++ b/buildd/grml-live_autobuild_grml-medium_etch.sh
@@ -36,7 +36,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml-medium_etch.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml-medium_sid.sh b/buildd/grml-live_autobuild_grml-medium_sid.sh
index 1b88631..bc34009 100755
--- a/buildd/grml-live_autobuild_grml-medium_sid.sh
+++ b/buildd/grml-live_autobuild_grml-medium_sid.sh
@@ -36,7 +36,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml-medium_sid.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml-small_etch.sh b/buildd/grml-live_autobuild_grml-small_etch.sh
index 8c6e5c1..7775e06 100755
--- a/buildd/grml-live_autobuild_grml-small_etch.sh
+++ b/buildd/grml-live_autobuild_grml-small_etch.sh
@@ -36,7 +36,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml-small_etch.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml-small_sid.sh b/buildd/grml-live_autobuild_grml-small_sid.sh
index df09981..1f4d0dc 100755
--- a/buildd/grml-live_autobuild_grml-small_sid.sh
+++ b/buildd/grml-live_autobuild_grml-small_sid.sh
@@ -36,7 +36,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml-small_sid.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml64-large_etch.sh b/buildd/grml-live_autobuild_grml64-large_etch.sh
index 26ba83e..cfa6360 100755
--- a/buildd/grml-live_autobuild_grml64-large_etch.sh
+++ b/buildd/grml-live_autobuild_grml64-large_etch.sh
@@ -40,7 +40,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml64-large_etch.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml64-large_sid.sh b/buildd/grml-live_autobuild_grml64-large_sid.sh
index f588c06..c456bdf 100755
--- a/buildd/grml-live_autobuild_grml64-large_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-large_sid.sh
@@ -40,7 +40,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml64-large_sid.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml64-medium_etch.sh b/buildd/grml-live_autobuild_grml64-medium_etch.sh
index 202fa58..b314d19 100755
--- a/buildd/grml-live_autobuild_grml64-medium_etch.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_etch.sh
@@ -40,7 +40,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml64-medium_etch.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml64-medium_sid.sh b/buildd/grml-live_autobuild_grml64-medium_sid.sh
index cbb79b9..9b52921 100755
--- a/buildd/grml-live_autobuild_grml64-medium_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_sid.sh
@@ -40,7 +40,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml64-medium_sid.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml64-small_etch.sh b/buildd/grml-live_autobuild_grml64-small_etch.sh
index 09628b2..91e06e8 100755
--- a/buildd/grml-live_autobuild_grml64-small_etch.sh
+++ b/buildd/grml-live_autobuild_grml64-small_etch.sh
@@ -40,7 +40,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml64-small_etch.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/grml-live_autobuild_grml64-small_sid.sh b/buildd/grml-live_autobuild_grml64-small_sid.sh
index bbe11d8..77675c8 100755
--- a/buildd/grml-live_autobuild_grml64-small_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-small_sid.sh
@@ -40,7 +40,7 @@ $ISO_DETAILS
 Return code of grml-live run was: $RC
 
 Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
+mutt -s "grml-live_autobuild_grml64-small_sid.sh [${DATE}] - $RC" \
      -a ${TMP_DIR}/stdout \
      -a ${TMP_DIR}/stderr \
      -a $ATTACHMENT \
diff --git a/buildd/upload_isos.sh b/buildd/upload_isos.sh
index 6749500..17b5f67 100755
--- a/buildd/upload_isos.sh
+++ b/buildd/upload_isos.sh
@@ -4,13 +4,16 @@
 # 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 Oct 07 13:06:09 CEST 2007 [mika]
+# Latest change: Mit Okt 10 09:46:08 CEST 2007 [mika]
 ################################################################################
 
 cd /grml-live/grml-isos || exit 1
 for file in *.iso ; do
     [ -f "${file}.md5" ] || md5sum $file > $file.md5
+    chmod 664 $file
+    chmod 664 ${file}.md5
 done
+umask 002
 rsync --partial -az --quiet /grml-live/grml-isos/* grml-build@debian.netcologne.de:/home/ftp/www.grml.org/daily/
 
 ## END OF FILE #################################################################
diff --git a/debian/changelog b/debian/changelog
index d6162d8..fe386f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ grml-live (0.0.5) unstable; urgency=low
     - grml-live_autobuild_grml-small_sid.sh
     - grml-live_autobuild_grml64-small_etch.sh
     - grml-live_autobuild_grml64-small_sid.sh
+  * Some more FAI error checking.
+  * Update buildd scripts (better subject handling).
   * Add new packages to GRML_FULL:
     - ack-grep
     - mailplate
diff --git a/grml-live b/grml-live
index 36359b0..f781b62 100755
--- a/grml-live
+++ b/grml-live
@@ -4,7 +4,7 @@
 # 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: Sat Oct 06 18:28:57 CEST 2007 [mika]
+# Latest change: Mit Okt 10 09:38:42 CEST 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -268,6 +268,8 @@ else
    ERROR=''
    if [ -r "/var/log/fai/dirinstall/$HOSTNAME/software.log" ] ; then
       grep 'dpkg: error processing' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=1
+      grep 'E: Method http has died unexpectedly!' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=2
+      grep 'ERROR: chroot' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=3
    fi
 
    if [ -r "/var/log/fai/dirinstall/$HOSTNAME/shell.log" ] ; then
@@ -275,10 +277,11 @@ else
    fi
 
    if [ -n "$ERROR" ] ; then
-      log "There was an error during execution of stage 'fai dirinstall' [$(date)]"
+      log "There was an error [${ERROR}] during execution of stage 'fai dirinstall' [$(date)]"
       eerror "There was an error during execution of stage 'fai dirinstall'"
       echo "   Check out /var/log/fai/dirinstall/$HOSTNAME/ for details. [exit ${ERROR}]"
-      eend 1 ; exit 1
+      eend 1
+      bailout 1
    else
       log "Finished execution of stage 'fai dirinstall' [$(date)]"
       einfo "Finished execution of stage 'fai dirinstall'"