X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=93478730493e5c1cc5a4db2fe4ba99f3bfe82896;hb=fecb05b5ae11d2f92905b81eafb7902ea85cafc6;hp=9cda0ce80d1eabc69c7092d9ca3d6ec7924b3ff1;hpb=d77909746a45785fcee15712c16e2015f90dba1f;p=grml-live.git diff --git a/grml-live b/grml-live index 9cda0ce..9347873 100755 --- a/grml-live +++ b/grml-live @@ -65,7 +65,7 @@ trap bailout 1 2 3 15 [ -n "$LOGDIR" ] || LOGDIR="/var/log/fai/dirinstall/$HOSTNAME" [ -d "$LOGDIR" ] || mkdir -p $LOGDIR -LOGFILE="$LOGDIR/grml-live.conf" +LOGFILE="$LOGDIR/grml-live.log" # }}} # some important functions {{{ @@ -188,6 +188,7 @@ if [ -z "$FORCE" ] ; then [ -n "$BUILD_TARGET" ] && echo " build target: $BUILD_TARGET" [ -n "$ISO_TARGET" ] && echo " ISO target: $ISO_TARGET" [ -n "$GRML_NAME" ] && echo " grml name: $GRML_NAME" + [ -n "$RELEASENAME" ] && echo " release name: $RELEASENAME" [ -n "$VERSION" ] && echo " grml version: $VERSION" [ -n "$SUITE" ] && echo " Debian suite: $SUITE" [ -n "$BOOT_METHOD" ] && echo " Boot method: $BOOT_METHOD" @@ -364,12 +365,12 @@ fi # create md5sum file: ( cd $BUILD_TARGET/GRML && -find .. -type f -not -name md5sums -exec md5sum {} \; > md5sums ) +find .. -type f -not -name md5sums -not -name isolinux.bin -exec md5sum {} \; > md5sums ) # }}} # ISO_TARGET - mkisofs {{{ [ -n "$ISO_TARGET" ] || ISO_TARGET="$TARGET/grml_isos" -[ -n "$ISO_NAME" ] || ISO_NAME="$GRML_NAME_${VERSION}.iso" +[ -n "$ISO_NAME" ] || ISO_NAME="${GRML_NAME}_${VERSION}.iso" if [ "$BOOT_METHOD" = "isolinux" ] ; then BOOT_FILE="boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"