X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=6e4522c2c17079abfa8d7a6d783ead1d828c1778;hb=eeb94c8c0817c0fc3d37266693eab7c66be9f3b2;hp=42157e853e9c9755f62030298f561b0aaaf64e79;hpb=102276a66f3f0e75f1c4b0043f9b9b24470c2e0e;p=grml-live.git diff --git a/grml-live b/grml-live index 42157e8..6e4522c 100755 --- a/grml-live +++ b/grml-live @@ -781,6 +781,10 @@ elif [ "$BOOT_METHOD" = "grub" ] ; then fi if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" ] ; then + log "$ISO_OUTPUT exists already, skipping stage 'iso build'" + ewarn "$ISO_OUTPUT exists already, skipping stage 'iso build'" ; eend 0 +else + mkdir -p "$ISO_OUTPUT" || bailout 6 "Problem with creating $ISO_OUTPUT for stage 'iso build'" # support mkisofs as well as genisoimage if which mkisofs >/dev/null 2>&1; then @@ -793,11 +797,6 @@ if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$ bailout fi - log "$ISO_OUTPUT exists already, skipping stage 'iso build'" - ewarn "$ISO_OUTPUT exists already, skipping stage 'iso build'" ; eend 0 -else - mkdir -p "$ISO_OUTPUT" || bailout 6 "Problem with creating $ISO_OUTPUT for stage 'iso build'" - CURRENT_DIR=$(pwd) if cd "$BUILD_OUTPUT" ; then log "$MKISOFS -V '${GRML_NAME} ${VERSION}' -publisher 'grml-live | grml.org' -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b $BOOT_FILE -o ${ISO_OUTPUT}/${ISO_NAME} ." @@ -873,8 +872,8 @@ fi # finalize {{{ [ -n "$start_seconds" ] && SECONDS="$[$(cut -d . -f 1 /proc/uptime)-$start_seconds]" || SECONDS="unknown" -einfo "Sucessfully finished execution of $PN [running ${SECONDS} seconds]" ; eend 0 -log "Sucessfully finished execution of $PN [running ${SECONDS} seconds]" +einfo "Successfully finished execution of $PN [running ${SECONDS} seconds]" ; eend 0 +log "Successfully finished execution of $PN [running ${SECONDS} seconds]" bailout 0 # }}}