summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-03-23 04:08:46 +0000
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:27 +0100
commit322d45eeaf84b53edd4a2481ef06a3c0a1a29ec0 (patch)
tree30a52990217fb60ff41592fb7485ac1d07149479
parent679aed644100f986881ff41bc2be02aba1b18b16 (diff)
downloadlive-build-322d45eeaf84b53edd4a2481ef06a3c0a1a29ec0.zip
live-build-322d45eeaf84b53edd4a2481ef06a3c0a1a29ec0.tar.gz
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.
-rwxr-xr-xhelpers/lh_binary_rootfs3
1 files changed, 3 insertions, 0 deletions
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"