projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add tf to GRML_FULL
[grml-live-grml.git]
/
buildd
/
functions.sh
diff --git
a/buildd/functions.sh
b/buildd/functions.sh
index
08d2661
..
b8652ff
100755
(executable)
--- a/
buildd/functions.sh
+++ b/
buildd/functions.sh
@@
-58,7
+58,7
@@
grml_live_run() {
fi
fi
fi
fi
- grml-live -F $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
+ grml-live -F $
* $
GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
-g $NAME -v $DATE -r grml-live-autobuild -i $ISO_NAME \
1>/var/log/grml-buildd.stdout \
2>/var/log/grml-buildd.stderr ; RC=$?
-g $NAME -v $DATE -r grml-live-autobuild -i $ISO_NAME \
1>/var/log/grml-buildd.stdout \
2>/var/log/grml-buildd.stderr ; RC=$?
@@
-78,8
+78,8
@@
create_logs() {
# store logs on remote server:
upload_logs() {
[ -n "$RSYNC_MIRROR" ] || return 1
# store logs on remote server:
upload_logs() {
[ -n "$RSYNC_MIRROR" ] || return 1
-# eval $(grep '^LOGDIR=' $FAI_LOGFILES/variables.log)
- rsync --
times --partial
-az --quiet /var/log/grml-buildd.* \
+ umask 002
+ rsync --
exclude dmesg.log --times --partial --copy-links
-az --quiet /var/log/grml-buildd.* \
$FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/
}
$FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/
}
@@
-103,7
+103,9
@@
$ISO_DETAILS
Return code of grml-live run was: $RC
Return code of grml-live run was: $RC
-$(grep 'Executed command line:' $GRML_LOGFILE || echo "* executed command line not available")
+$(grep -A2 'Executed grml-live' $GRML_LOGFILE || echo "* executed grml-live command line not available")
+
+$(grep -A2 'Executed FAI' $GRML_LOGFILE || echo "* executed FAI command line not available")
The following errors have been noticed (several might be warnings only):
The following errors have been noticed (several might be warnings only):
@@
-129,7
+131,10
@@
EOF " | \
store_iso() {
if [ "$RC" = "0" ] ; then
[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
store_iso() {
if [ "$RC" = "0" ] ; then
[ -d "$ISO_DIR" ] || mkdir "$ISO_DIR"
- mv $OUTPUT_DIR/grml_isos/$ISO_NAME $ISO_DIR
+ mv "${OUTPUT_DIR}/grml_isos/${ISO_NAME}" "$ISO_DIR"
+ if [ -r "${OUTPUT_DIR}/grml_isos/${ISO_NAME}.md5" ] ; then
+ mv "${OUTPUT_DIR}/grml_isos/${ISO_NAME}.md5" "${ISO_DIR}"
+ fi
fi
}
fi
}