[SCM] debian-live/live-helper branch, master, updated. 1.0_a38-1-18-gdd6a5d4

[Daniel Baumann]

The following commit has been merged in the master branch:
commit dd6a5d408bd43b99c9b7b94704b51a5e5a275b34
Author: Bas Wijnen <wijnen at debian.org>
Date:   Sun Mar 2 08:24:59 2008 +0100

    Making usb-hdd images large enough (Closes: #468855).
    
    When building a very minimal live system on a usb-hdd target, the generated
    image is too small. A very minimal system is smaller than 50MB, and so this is
    the same as DU_DIM for such a system. This is too small. Unconditionally adding
    one solves the problem.

diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 44eaac5..6298c4c 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -82,7 +82,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)" # Just 2% more to be sure, need something more sophistcated here...
+REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 50 + 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 14b32d8..914d1ee 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -72,7 +72,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)" # Just 2% more to be sure, need something more sophistcated here...
+REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 50 + 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/live-helper