X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=da67813509d121a81cb6925c5f419b8e240b0a6b;hb=51cffccb5848a8b049dce858551ee6759117e123;hp=beff79c71bd581a060519f9e8a5e499d900c3cc7;hpb=76c2477869d78db80ac901df171685789a8f139b;p=grml-live.git diff --git a/grml-live b/grml-live index beff79c..da67813 100755 --- a/grml-live +++ b/grml-live @@ -23,7 +23,7 @@ fi set -e # global variables -GRML_LIVE_VERSION='0.9.32-pre1' +GRML_LIVE_VERSION='0.9.33-pre1' PN="$(basename $0)" CMDLINE="$0 $@" SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list' @@ -1043,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 @@ -1094,9 +1101,17 @@ 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 [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 # }}}