[SCM] debian-live branch, master, updated. 1.0.0-2-18-g47149a5

[Chris Lamb]

The following commit has been merged in the master branch:
commit 89f8e79481f60c092c797fb5d8dc38e8ddebd8b3
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Sep 7 14:41:27 2008 +0100

    Make percentage allowances in image size more explicit.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 718f79f..a3cd769 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -137,7 +137,7 @@ 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="$(expr ${DU_DIM} + ${DU_DIM} \* 5 / 100)" # Just 5% more to be sure, need something more sophistcated here...
 		if [ "${LH_DISTRIBUTION}" = "etch" ]
 		then
 			RESERVED_PERCENTAGE="--reserved-blocks"
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 0b4663d..24c801c 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="$(expr ${DU_DIM} + ${DU_DIM} \* 2 / 100 + 1)" # Just 2% more to be sure, need something more sophistcated here...
 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 1283667..915d59f 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="$(expr ${DU_DIM} + ${DU_DIM} \* 2 / 100 + 1)" # Just 2% more to be sure, need something more sophistcated here...
 dd if=/dev/zero of=source.img bs=1024k count=0 seek=${REAL_DIM}
 FREELO="$(${LH_LOSETUP} -f)"
 if [ ! -b chroot/${FREELO} ]

-- 
debian-live