--- a/debian/changelog Sat Feb 16 21:12:19 2008 +0100
+++ b/debian/changelog Sun Feb 17 00:45:04 2008 +0100
@@ -1,3 +1,10 @@ grml-live (0.4) unstable; urgency=low
+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:
--- a/docs/grml-live.txt Sat Feb 16 21:12:19 2008 +0100
+++ b/docs/grml-live.txt Sun Feb 17 00:45:04 2008 +0100
@@ -17,7 +17,7 @@ grml-live [-a <architecture>] [-c <class
*******************************************************************************
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
--- a/grml-live Sat Feb 16 21:12:19 2008 +0100
+++ b/grml-live Sun Feb 17 00:45:04 2008 +0100
@@ -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)]"