Use grml-live.log as logfile; Added vim to GRML_MEDIUM package list

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index 9cda0ce..9347873 100755 (executable)
--- 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"