[SCM] live-helper branch, debian-next, updated. debian/2.0_a16-1-10-gbeb21bb

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 60d869de1c6adaa14b9cd9328a45f7b006df8335
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jul 2 14:29:52 2010 +0200

    Adding slightly modified patch from Alexander Sack <asac at linaro.org> to add meta info about filesystem size in binary_rootfs.

diff --git a/helpers/binary_rootfs b/helpers/binary_rootfs
index ac2b1e7..7aa4fb7 100755
--- a/helpers/binary_rootfs
+++ b/helpers/binary_rootfs
@@ -111,6 +111,12 @@ case "${LH_CHROOT_FILESYSTEM}" in
 				# Move image
 				mv chroot/filesystem.${LH_CHROOT_FILESYSTEM} binary/${INITFS}
 
+				case "${LH_MODE}" in
+					ubuntu)
+						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
+						;;
+				esac
+
 				if [ -e chroot/chroot.cache ]
 				then
 					rm -f .lock
@@ -308,6 +314,12 @@ case "${LH_CHROOT_FILESYSTEM}" in
 				# Create image
 				Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
 
+				case "${LH_MODE}" in
+					ubuntu)
+						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
+						;;
+				esac
+
 				# Move image
 				${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
 				${LH_ROOT_COMMAND} rm -f chroot/squashfs.sort
@@ -363,6 +375,12 @@ case "${LH_CHROOT_FILESYSTEM}" in
 
 			false)
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
+
+				case "${LH_MODE}" in
+					ubuntu)
+						du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
+						;;
+				esac
 				;;
 		esac
 

-- 
live-helper