Using LB_HDD_SIZE to determine the size of the image.

If LB_HDD_SIZE is "auto" the size will be determined automatically as before
else it will be the given size in MB.

Also setting the default for this to "auto"
This commit is contained in:
Michael Stummvoll 2013-04-02 13:59:38 +02:00 committed by Daniel Baumann
parent 765ae792d4
commit 428da01aea
2 changed files with 9 additions and 3 deletions

View File

@ -890,7 +890,7 @@ Set_defaults ()
esac
# Setting hdd size
LB_HDD_SIZE="${LB_HDD_SIZE:-10000}"
LB_HDD_SIZE="${LB_HDD_SIZE:-auto}"
# Setting iso volume
case "${LB_MODE}" in

View File

@ -121,8 +121,14 @@ then
fi
# Everything which comes here needs to be cleaned up,
DU_DIM="$(du -ms binary | cut -f1)"
REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_BINARY_FILESYSTEM})"
if [ "$LB_HDD_SIZE" = "auto" ];
then
DU_DIM="$(du -ms binary | cut -f1)"
REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_BINARY_FILESYSTEM})"
else
REAL_DIM=$LB_HDD_SIZE
fi
dd if=/dev/zero of=chroot/binary.img bs=1024k count=0 seek=${REAL_DIM}
FREELO="$(${LB_LOSETUP} -f)"
if [ ! -b chroot/${FREELO} ]