X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=da67813509d121a81cb6925c5f419b8e240b0a6b;hb=51cffccb5848a8b049dce858551ee6759117e123;hp=20df250b6c00613431f75fc6060ddfbe5087bdfa;hpb=0f85d1ba6a21ba9426fcf3c867227e48573e4cdf;p=grml-live.git diff --git a/grml-live b/grml-live index 20df250..da67813 100755 --- a/grml-live +++ b/grml-live @@ -554,13 +554,6 @@ 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'" @@ -1050,6 +1043,13 @@ else else log "Creating hybrid ISO file with isohybrid method" einfo "Creating hybrid ISO file with isohybrid method" + # Notes for consideration: + # "-entry 4 -type 1c" + # * using 4 as the partition number is supposed to help with BIOSes + # that only support USB-Zip boot + # * using 1c (i.e. hidden FAT32 LBA), instead of the default 0x17 + # (hidden NTFS, IIRC), as the partition type is sometimes needed + # to get the BIOS even look at the partition created by isohybrid isohybrid "${ISO_OUTPUT}/${ISO_NAME}" eend $? fi @@ -1101,6 +1101,14 @@ 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 + ewarn "The following packages were requested for installation but could not be processed:" + cat $CHECKLOG/package_errors.log + eend 0 +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]"