X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=20df250b6c00613431f75fc6060ddfbe5087bdfa;hp=afbf7d64275456f19584eb5b71be74651fe91c3b;hb=08d8db7511b78113edfb8ef04a40706315fd73a7;hpb=d900a0e4047e51b27cda624a104ae97a1625c080 diff --git a/grml-live b/grml-live index afbf7d6..20df250 100755 --- a/grml-live +++ b/grml-live @@ -23,7 +23,7 @@ fi set -e # global variables -GRML_LIVE_VERSION='0.9.32' +GRML_LIVE_VERSION='0.9.33-pre1' PN="$(basename $0)" CMDLINE="$0 $@" SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list' @@ -554,6 +554,13 @@ else grep 'FAILED with exit code' $CHECKLOG/shell.log >> $LOGFILE && ERROR=2 fi + # package validator + if [ -r "$CHECKLOG/package_errors.log" ] && grep -q '[a-z]' "$CHECKLOG/package_errors.log" ; then + ewarn "The following packages were requested for installation but could not be processed:" + cat $CHECKLOG/package_errors.log + eend 0 + fi + if [ -n "$ERROR" ] ; then log "Error: there was a critical error [${ERROR}] during execution of stage 'fai dirinstall' [$(date)]" eerror "Error: there was a critical error during execution of stage 'fai dirinstall'" @@ -1095,8 +1102,8 @@ fi # finalize {{{ [ -n "$start_seconds" ] && SECONDS="$[$(cut -d . -f 1 /proc/uptime)-$start_seconds]" || SECONDS="unknown" -einfo "Successfully finished execution of $PN [running ${SECONDS} seconds]" ; eend 0 -log "Successfully finished execution of $PN [running ${SECONDS} seconds]" +einfo "Successfully finished execution of $PN [$(date) - running ${SECONDS} seconds]" ; eend 0 +log "Successfully finished execution of $PN [$(date) - running ${SECONDS} seconds]" bailout 0 # }}}