X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=aaaf48f6388def97aee86dc8e3e9ae50cc521f2a;hp=207f9820a111933fc60f2457d94f6a818db5f239;hb=42c15c9e98e348be9c6f355a3b52373db981b52c;hpb=651bc9e2711b53f189a97dd125ef025aa9a8bd90 diff --git a/grml-live b/grml-live index 207f982..aaaf48f 100755 --- a/grml-live +++ b/grml-live @@ -572,6 +572,25 @@ else fi # BUILD_DIRTY? # }}} +# package validator {{{ +CHECKLOG=/var/log/fai/$HOSTNAME/last +# package validator +if [ -r "$CHECKLOG/package_errors.log" ] && grep -q '[a-z]' "$CHECKLOG/package_errors.log" ; then + + if [ -n "$EXIT_ON_MISSING_PACKAGES" ] ; then + eerror "The following packages were requested for installation but could not be processed:" + cat $CHECKLOG/package_errors.log + eerror "... exiting as requested via \$EXIT_ON_MISSING_PACKAGES." + eend 1 + bailout 13 + else + ewarn "The following packages were requested for installation but could not be processed:" + cat $CHECKLOG/package_errors.log + eend 0 + fi +fi +# }}} + # BUILD_OUTPUT - execute arch specific stuff and squashfs {{{ [ -n "$BUILD_OUTPUT" ] || BUILD_OUTPUT="$OUTPUT/grml_cd" mkdir -p "$BUILD_OUTPUT" || bailout 6 "Problem with creating $BUILD_OUTPUT for stage ARCH" @@ -1101,23 +1120,6 @@ fi # }}} # finalize {{{ -CHECKLOG=/var/log/fai/$HOSTNAME/last -# package validator -if [ -r "$CHECKLOG/package_errors.log" ] && grep -q '[a-z]' "$CHECKLOG/package_errors.log" ; then - - if [ -n "$EXIT_ON_MISSING_PACKAGES" ] ; then - eerror "The following packages were requested for installation but could not be processed:" - cat $CHECKLOG/package_errors.log - eerror "... exiting as requested via \$EXIT_ON_MISSING_PACKAGES." - eend 1 - bailout 13 - else - ewarn "The following packages were requested for installation but could not be processed:" - cat $CHECKLOG/package_errors.log - eend 0 - fi -fi - [ -n "$start_seconds" ] && SECONDS="$[$(cut -d . -f 1 /proc/uptime)-$start_seconds]" || SECONDS="unknown" einfo "Successfully finished execution of $PN [$(date) - running ${SECONDS} seconds]" ; eend 0 log "Successfully finished execution of $PN [$(date) - running ${SECONDS} seconds]"