diff options
| author | Colin Watson <cjwatson@canonical.com> | 2011-05-25 11:32:52 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-03 10:44:25 +0200 |
| commit | 7b92318f6459ecd9f5d620a8b7012f70bf5c9bf1 (patch) | |
| tree | ef6b6e78ce7ff32b0c1cf9342f080ff9669cb555 /scripts/build/lb_binary_rootfs | |
| parent | 348cb4b391ea151511a077636a112b7399f99088 (diff) | |
| download | vyos-live-build-7b92318f6459ecd9f5d620a8b7012f70bf5c9bf1.tar.gz vyos-live-build-7b92318f6459ecd9f5d620a8b7012f70bf5c9bf1.zip | |
Fixing ext2/ext3 case in lb_binary_rootfs to work with --build-with-chroot false (Closes: #627902).
Diffstat (limited to 'scripts/build/lb_binary_rootfs')
| -rwxr-xr-x | scripts/build/lb_binary_rootfs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index 52204d4ac..85785fc7e 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" |