X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=buildd%2Fgrml-live_autobuild_grml-medium_etch.sh;h=772816e7fd264766ca19a12550b7edc5e134c2c4;hb=c5624ba39fa032cda30698121bb8775640edb965;hp=79884627dc0b4b6545b754bf79be2a6b745fa90d;hpb=a49504d976dc57d6c50be3a632a98acacdac962d;p=grml-live.git

diff --git a/buildd/grml-live_autobuild_grml-medium_etch.sh b/buildd/grml-live_autobuild_grml-medium_etch.sh
index 7988462..772816e 100755
--- a/buildd/grml-live_autobuild_grml-medium_etch.sh
+++ b/buildd/grml-live_autobuild_grml-medium_etch.sh
@@ -1,49 +1,25 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
+# settings for grml_live_run:
 DATE=$(date +%Y%m%d)
-STORAGE=/srv/
-OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-TMP_DIR=$(mktemp -d)
-MUTT_HEADERS=$(mktemp)
-ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-RECIPIENT=grml-live@ml.grml.org
 ISO_NAME=grml-medium_etch_$DATE.iso
-ISO_DIR=/srv/grml-isos
-[ -n "$TMP_DIR" ] || exit 10
-[ -n "$MUTT_HEADERS" ] || exit 20
-echo "my_hdr From: grml-live autobuild daemon <grml-live@grml.org>" > $MUTT_HEADERS
-
-# execute grml-live:
-grml-live -F -s etch -c GRMLBASE,I386,GRML_MEDIUM -o $OUTPUT_DIR \
-          -g grml-medium -v $DATE -r grml-live-autobuild -i $ISO_NAME          \
-	  1>${TMP_DIR}/stdout 2>${TMP_DIR}/stderr ; RC=$?
-
-# create log archive:
-tar zcf $ATTACHMENT /var/log/fai/dirinstall/grml 1>/dev/null
+SUITE=sid
+CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,I386'
+NAME=grml-medium
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
 
-ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
+. /usr/share/grml-live/buildd/functions.sh || exit 1
 
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-medium_etch.sh
+# execute grml-live:
+grml_live_run
 
-$ISO_DETAILS
+create_logs
 
-Return code of grml-live run was: $RC
+iso_details
 
-Find details in the attached logs." | \
-mutt -s "grml-live_autobuild_grml-medium_etch.sh [${DATE}] - $RC" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
+send_mail
 
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+store_iso
 
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+bailout