From 9bba4f868d5cbdde2f358cb156941331655752eb Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 22 Dec 2007 09:48:50 +0100 Subject: [PATCH] Adjust buildd/functions.sh for new logging --- buildd/functions.sh | 6 ++++-- debian/changelog | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/buildd/functions.sh b/buildd/functions.sh index aa61132..471a126 100755 --- a/buildd/functions.sh +++ b/buildd/functions.sh @@ -78,7 +78,7 @@ create_logs() { # store logs on remote server: upload_logs() { [ -n "$RSYNC_MIRROR" ] || return 1 -# eval $(grep '^LOGDIR=' $FAI_LOGFILES/variables.log) + umask 022 rsync --exclude dmesg.log --times --partial -az --quiet /var/log/grml-buildd.* \ $FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/ } @@ -103,7 +103,9 @@ $ISO_DETAILS 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): diff --git a/debian/changelog b/debian/changelog index 73369b6..b65e1b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ grml-live (0.0.14) unstable; urgency=low /etc/grml/fai/config/scripts/GRMLBASE/95-package-information * Configure apt-listchanges via new script /etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges + * Adjust buildd/functions.sh for new logging. * Drop findimagedupes from GRML_FULL (too many new dependencies, being: libgraphics-magick-perl libgraphicsmagick1 libwmf0.2-7) * Add new packages to GRML_FULL: -- 2.1.4