[SCM] live-build branch, debian, updated. debian/3.0_a17-1-10-gb9ddc38
Daniel Baumann
daniel at debian.org
Fri Jun 3 10:01:34 UTC 2011
The following commit has been merged in the debian branch:
commit 7b92318f6459ecd9f5d620a8b7012f70bf5c9bf1
Author: Colin Watson <cjwatson at canonical.com>
Date: Wed May 25 11:32:52 2011 +0100
Fixing ext2/ext3 case in lb_binary_rootfs to work with --build-with-chroot false (Closes: #627902).
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 52204d4..85785fc 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -100,7 +100,16 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
fi
- DU_DIM="$(du -ks chroot/chroot | cut -f1)"
+ case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ DU_DIM="$(du -ks chroot/chroot | cut -f1)"
+ ;;
+
+ false)
+ DU_DIM="$(du -ks chroot | cut -f1)"
+ ;;
+ esac
+
REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_CHROOT_FILESYSTEM})"
RESERVED_PERCENTAGE="--reserved-percentage"
--
live-build
More information about the debian-live-changes
mailing list