-[ -n "$OUTPUT_DIR" ] || OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
-[ -n "$ISO_DIR" ] || ISO_DIR=$STORAGE/grml-isos
-[ -n "$RECIPIENT" ] || RECIPIENT=root@localhost
-[ -n "$ATTACHMENT" ] || ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
-[ -n "$LOGFILES" ] || LOGFILES=/var/log/fai/dirinstall/grml
-[ -n "$FROM" ] || FROM=root@localhost
+[ -n "$OUTPUT_DIR" ] || OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
+[ -n "$ISO_DIR" ] || ISO_DIR=$STORAGE/grml-isos
+[ -n "$RECIPIENT" ] || RECIPIENT=root@localhost
+[ -n "$ATTACHMENT" ] || ATTACHMENT=$TMP_DIR/grml-live-logs_$DATE.tar.gz
+[ -n "$FROM" ] || FROM=root@localhost
+
+if [ -n "$LOGFILE" ] ; then
+ GRML_LOGFILE="$LOGFILE"
+else
+ [ -n "$GRML_LOGFILE" ] || GRML_LOGFILE=/var/log/grml-live.log
+fi
+
+[ -n "$FAI_LOGFILES" ] || FAI_LOGFILES=/var/log/fai/grml/last