summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-03-23 04:08:46 +0000
committerChris Lamb <chris@chris-lamb.co.uk>2008-03-23 04:08:46 +0000
commit31dca28f67ecf02cd2b60b3cc04305fabad793d7 (patch)
tree30a52990217fb60ff41592fb7485ac1d07149479
parent32f6dcd3a32d0d17292d48ce5871622604aceb60 (diff)
downloadvyos-live-build-31dca28f67ecf02cd2b60b3cc04305fabad793d7.tar.gz
vyos-live-build-31dca28f67ecf02cd2b60b3cc04305fabad793d7.zip
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 109e50808..f07609d0b 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"