[ -n "$SUITE" ] || die "\$SUITE is not set. Exiting."
[ -n "$CLASSES" ] || die "\$CLASSES is not set. Exiting."
[ -n "$NAME" ] || die "\$NAME is not set. Exiting."
-[ -n "$ISO_NAME" ] || die "\$ISO_NAME is not set. Exiting."
+[ -n "$PRODUCT_NAME" ] || die "\$PRODUCT_NAME is not set. Exiting."
# some defaults:
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
DATE=$(date +'%Y%m%d_%H%M%S')
TMP_DIR="$(mktemp -d)"
[ -n "$TMP_DIR" ] || die "Could not create \$TMP_DIR. Exiting."
+ISO_NAME="${PRODUCT_NAME}.iso"
# make sure we have same safe defaults:
[ -n "$OUTPUT_DIR" ] || OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
TIME_START=$(date +%s)
grml-live -F $* -a $ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
-g "$grml_name" -v "$shortdate" -r grml-live-autobuild -i $ISO_NAME \
- >/var/log/grml-buildd.stdout.log \
- 2>/var/log/grml-buildd.stderr.log ; RC=$?
+ >/var/log/grml-buildd.log 2>&1 ; RC=$?
TIME_END=$(date +%s)
WALLTIME=$(($TIME_END-$TIME_START))
# create log archive:
create_logs() {
- ( cd / && tar zcfh $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.stderr.log /var/log/grml-buildd.stdout $GRML_LOGFILE >/dev/null )
+ ( cd / && tar zcfh $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.log $GRML_LOGFILE >/dev/null )
}
# store logs on remote server:
upload_logs() {
[ -n "$RSYNC_MIRROR" ] || return 1
- rsync --exclude dmesg.log --times --partial --copy-links -rltDz --quiet /var/log/grml-buildd.* \
- $FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/
+ rsync --exclude dmesg.log --times --partial --copy-links -rltDz --quiet /var/log/grml-buildd.log \
+ $FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${PRODUCT_NAME}_${DATE}"/
}
# store information of ISO size:
The following errors have been noticed (several might be warnings only):
-$(grep -i error $FAI_LOGFILES/*.log /var/log/grml-buildd.std* | grep -ve liberror -ve libgpg-error -ve libcomerr -ve 'no errors found' || echo "* nothing")
+$(grep -i error $FAI_LOGFILES/*.log /var/log/grml-buildd.log | grep -ve liberror -ve libgpg-error -ve libcomerr -ve 'no errors found' || echo "* nothing")
The following errors have been noticed in FAI scripts:
The following warnings have been noticed:
-$(grep -i warn $FAI_LOGFILES/* /var/log/grml-buildd.std* || echo "* nothing")
+$(grep -i warn $FAI_LOGFILES/* /var/log/grml-buildd.log || echo "* nothing")
There following dependency problems have been noticed:
EOF" | \
mutt -e "my_hdr From: grml-live autobuild daemon <$FROM>" -s "$SCRIPTNAME [${DATE}] - $RC_INFO" \
- -a /var/log/grml-buildd.stderr.log $MUTT_ATTACH -- "$RECIPIENT"
+ -a /var/log/grml-buildd.log $MUTT_ATTACH -- "$RECIPIENT"
}
# make sure we store the final iso: