Removed hardcoded grml.squashfs

diff --git a/debian/changelog b/debian/changelog
index 988f149..a4af97b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-live (0.5) unstable; urgency=low
+
+  * Make sure we use ${GRML_NAME}.squashfs instead of hardcoded
+    grml.squashfs.
+
+ -- Michael Prokop <mika@grml.org>  Sun, 17 Feb 2008 00:44:18 +0100
+
 grml-live (0.4) unstable; urgency=low
 
   * Add new packages to GRML_FULL:

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 5a41174..47f5b94 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -17,7 +17,7 @@ grml-live [-a <architecture>] [-c <classe[s]>] [-g <grml_name>] [-i <iso_name> ]
 *******************************************************************************
 Important! This document is growing as requested. If you have questions which
 aren't answered by this document yet please let me know: <mika@grml.org>!
-This document currently applies to grml-live version 0.4.
+This document currently applies to grml-live version 0.5.
 *******************************************************************************
 
 Description

diff --git a/grml-live b/grml-live
index b4161dd..41ab78a 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Fri Feb 15 16:08:28 CET 2008 [mika]
+# Latest change: Sun Feb 17 00:44:47 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.4'
+GRML_LIVE_VERSION='0.5'
 CMDLINE="$0 $@"
 ISO_DATE="$(date +%Y-%m-%d)"
 
@@ -548,7 +548,7 @@ else
    eerror 'Error: Unsupported ARCH, sorry. Want to support it? Contribute!' ; eend 1
 fi
 
-if [ -f "$BUILD_OUTPUT"/live/grml.squashfs -a -z "$UPDATE" -a -z "$BUILD_ONLY" ] ; then
+if [ -f "$BUILD_OUTPUT"/live/${GRML_NAME}.squashfs -a -z "$UPDATE" -a -z "$BUILD_ONLY" ] ; then
    log "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'"
    ewarn "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'" ; eend 0
 else
@@ -558,10 +558,10 @@ else
 
    # execute squashfs:
    if mksquashfs --help 2>&1 | grep -q -- -no-progress ; then
-      log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress"
+      log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/${GRML_NAME}.squashfs -noappend -no-progress"
       mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs -noappend -no-progress $SQUASHFS_OPTIONS $SQUASHFS_ZLIB
    else
-      log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend"
+      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
    log "Finished execution of stage 'squashfs' [$(date)]"