[SCM] debian-live/live-helper branch, master, updated. 1.0_a40-1-17-g7150380

[Chris Lamb]

The following commit has been merged in the master branch:
commit 31dca28f67ecf02cd2b60b3cc04305fabad793d7
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Mar 23 04:08:46 2008 +0000

    lh_binary_rootfs: Remove
    
    mksquashfs has a nasty habit of segfaulting when creating an image where
    an image already exists. This can happen, for example, if you are
    performing multiple runs of lh_binary and the build breaks for some reason.
    
    This is almost certainly a bug in mksquashfs; I will look into finding a
    suitable testcase.

diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 109e508..f07609d 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -215,6 +215,9 @@ case "${LH_CHROOT_FILESYSTEM}" in
 			rm -f binary/${INITFS}/filesystem.squashfs
 		fi
 
+		# Remove stale squashfs image
+		rm -f chroot/filesystem.squashfs
+
 		if [ "${LH_QUIET}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ] && [ "${LH_DISTRIBUTION}" != "testing" ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"

-- 
debian-live/live-helper