Merge branch 'mika/efi'

[grml-live.git] / buildd / grml-live_autobuild_grml-medium_sid.sh

diff --git a/buildd/grml-live_autobuild_grml-medium_sid.sh b/buildd/grml-live_autobuild_grml-medium_sid.sh
index 1b88631..a655255 100755 (executable)
--- a/buildd/grml-live_autobuild_grml-medium_sid.sh
+++ b/buildd/grml-live_autobuild_grml-medium_sid.sh
@@ -1,49 +1,13 @@
 #!/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=/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_sid_$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 sid -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
-
-ISO_DETAILS=$(ls -lh $OUTPUT_DIR/grml_isos/$ISO_NAME)
-
-# send status mail:
-echo -en "Automatically generated mail by grml-live_autobuild_grml-medium_sid.sh
-
-$ISO_DETAILS
-
-Return code of grml-live run was: $RC
-
-Find details in the attached logs." | \
-mutt -s "grml-live autobuild daemon: $DATE" \
-     -a ${TMP_DIR}/stdout \
-     -a ${TMP_DIR}/stderr \
-     -a $ATTACHMENT \
-     $RECIPIENT
-
-# make sure we store the final iso:
-[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
-mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
-
-rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR"
+# settings for grml_live_run:
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml-medium_sid_$SHORTDATE
+SUITE=sid
+CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,I386,IGNORE'
+NAME=grml-medium
+SCRIPTNAME="$(basename $0)"
+ARCH=i386
+
+# finally just source main file
+. /usr/share/grml-live/buildd/execute.sh   || exit 1