From 8d373e005b776d56a327385d1569883758d5af21 Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Sun, 7 Sep 2008 15:39:29 +0100 Subject: Refactor partition size calculation, ensuring a uniform increase for ext partitions. --- helpers/lh_binary_rootfs | 3 ++- helpers/lh_binary_usb-hdd | 2 +- helpers/lh_source_usb-hdd | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'helpers') diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index 718f79fd3..85cccb910 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -137,7 +137,8 @@ case "${LH_CHROOT_FILESYSTEM}" in fi DU_DIM="$(du -ks chroot/chroot | cut -f1)" - REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 20)" # Just 5% more to be sure, need something more sophistcated here... + REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_CHROOT_FILESYSTEM})" + if [ "${LH_DISTRIBUTION}" = "etch" ] then RESERVED_PERCENTAGE="--reserved-blocks" diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd index 0b4663d8d..77be5396f 100755 --- a/helpers/lh_binary_usb-hdd +++ b/helpers/lh_binary_usb-hdd @@ -91,7 +91,7 @@ fi # Everything which comes here needs to be cleaned up, DU_DIM="$(du -ms binary | cut -f1)" -REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 50 + 1)" # Just 2% more to be sure, need something more sophistcated here... +REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})" dd if=/dev/zero of=chroot/binary.img bs=1024k count=0 seek=${REAL_DIM} FREELO="$(${LH_LOSETUP} -f)" if [ ! -b chroot/${FREELO} ] diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd index 128366790..73949e34b 100755 --- a/helpers/lh_source_usb-hdd +++ b/helpers/lh_source_usb-hdd @@ -67,7 +67,7 @@ fi # Everything which comes here needs to be cleaned up, DU_DIM="$(du -ms source | cut -f1)" -REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 50 + 1)" # Just 2% more to be sure, need something more sophistcated here... +REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})" dd if=/dev/zero of=source.img bs=1024k count=0 seek=${REAL_DIM} FREELO="$(${LH_LOSETUP} -f)" if [ ! -b chroot/${FREELO} ] -- cgit v1.2.3