From 50ba767cfc6a3e3bd3df02b3886e6e818afbda2c Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 26 Nov 2007 00:47:57 +0100 Subject: [PATCH] Remove base.tgz from chroot directory --- debian/changelog | 1 + grml-live | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index e96bfe1..166dff7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ grml-live (0.0.10) unstable; urgency=low * Make sure we have pinning for grml-stable and grml-testing repositories via /etc/grml/fai/apt/preferences, not matter where the packages come from (web vs. local mirror/cache for example). + * Remove base.tgz from chroot directory. * Do not create /etc/sysconfig/network-scripts and /etc/sysconfig/provider any longer in cleanup script. * Fix typo in bootsplash f3 (thanks, jimmy). diff --git a/grml-live b/grml-live index e525e89..0c3b5fe 100755 --- a/grml-live +++ b/grml-live @@ -531,6 +531,10 @@ if [ -f "$BUILD_OUTPUT"/live/grml.squashfs -a -z "$UPDATE" ] ; then ewarn "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'" ; eend 0 else [ -d "$BUILD_OUTPUT"/live ] || mkdir "$BUILD_OUTPUT"/live + # make sure we don't leave (even an empty) base.tgz: + [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz" + + # execute squashfs: log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend" mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend log "Finished execution of stage 'squashfs' [$(date)]" -- 2.1.4