X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=1afacbd9eb711955b1c16052675bd43f96263a38;hp=e64f2854b9e2e73a46c7254502efaed6f4db97bf;hb=dc414881cc395cc454d2db66b5adb94364b8aa49;hpb=f941fe942637ddd1b383ae2de90dfb2a3e8bd9eb diff --git a/grml-live b/grml-live index e64f285..1afacbd 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: Wed Feb 20 17:13:16 CET 2008 [mika] +# Latest change: Sat Feb 23 11:12:27 CET 2008 [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.5' +GRML_LIVE_VERSION='0.6' CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" @@ -517,6 +517,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then # make sure the squashfs filename is set accordingly: GRML_NAME_SQUASHFS="$GRML_NAME.squashfs" + sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/isolinux.cfg sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg GRML_NAME_SQUASHFS="$(cut_string 20 "$GRML_NAME_SQUASHFS")" @@ -572,6 +573,7 @@ else log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/${GRML_NAME}.squashfs -noappend" mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB fi + echo "${GRML_NAME}.squashfs" > $BUILD_OUTPUT/live/filesystem.module log "Finished execution of stage 'squashfs' [$(date)]" einfo "Finished execution of stage 'squashfs'" ; eend 0 fi