X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=a4a1fa83ade60083beece15097c30eca910e767b;hb=ce2488fd462565431f378e96f4dee01b17c7ba9a;hp=e525e8927d54177c747d6c3f327c2796ce0bd9ed;hpb=eea5874d5af59cc56ae34b618bf674b40706aeb3;p=grml-live.git diff --git a/grml-live b/grml-live index e525e89..a4a1fa8 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Nov 25 20:08:06 CET 2007 [mika] +# Latest change: Mon Nov 26 15:13:41 CET 2007 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -15,7 +15,7 @@ export LC_ALL=C # exit on any error: set -e -GRML_LIVE_VERSION='0.0.10' +GRML_LIVE_VERSION='0.0.11' CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" @@ -531,6 +531,10 @@ if [ -f "$BUILD_OUTPUT"/live/grml.squashfs -a -z "$UPDATE" ] ; then ewarn "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'" ; eend 0 else [ -d "$BUILD_OUTPUT"/live ] || mkdir "$BUILD_OUTPUT"/live + # make sure we don't leave (even an empty) base.tgz: + [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz" + + # execute squashfs: log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend" mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend log "Finished execution of stage 'squashfs' [$(date)]"