X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Fgrml-live_autobuild_grml64-medium_sid.sh;fp=buildd%2Fgrml-live_autobuild_grml64-medium_sid.sh;h=e45eeb5b1eee78d4cca24675942ab2ea7b6bfe6a;hp=9b52921a85edebad26911740679a233c72160656;hb=a090ad82e812624a5e67b957f5b50878b28b457e;hpb=6c3215fe7320b9e69fbcc652e4b87f426df0ea94

diff --git a/buildd/grml-live_autobuild_grml64-medium_sid.sh b/buildd/grml-live_autobuild_grml64-medium_sid.sh
index 9b52921..e45eeb5 100755
--- a/buildd/grml-live_autobuild_grml64-medium_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_sid.sh
@@ -1,53 +1,23 @@
 #!/bin/sh
 
-set -u
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
-
-# configuration:
-DATE=$(date +%Y%m%d)
-STORAGE=/grml-live/
-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
+. main.sh || exit 1
+
+# settings for grml_live_run:
 ISO_NAME=grml64-medium_sid_$DATE.iso
-ISO_DIR=/grml-live/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
+SUITE=sid
+CLASSES='GRMLBASE,GRML_MEDIUM,AMD64'
+NAME=grml64-medium
+SCRIPTNAME="$(basename $0)"
 
 # execute grml-live:
-grml-live -F -s sid -c GRMLBASE,AMD64,GRML_MEDIUM -o $OUTPUT_DIR \
-          -g grml64-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
-
-if ! [ -f "$OUTPUT_DIR/grml_isos/$ISO_NAME" ] ; then
-   ISO_DETAILS="There was an error creating $ISO_NAME"
-else
-   ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-fi
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-medium_sid.sh
+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_grml64-medium_sid.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