[SCM] debian-live/live-helper branch, master, updated. 1.0_a27-1-59-g662275b

[Daniel Baumann]

The branch, master has been updated
       via  662275be9c18da5d182670c21e6e48bc273d8ef2 (commit)
      from  80ffa2228100e1b82d76e9285b56f0550b1c9d30 (commit)


- Shortlog ------------------------------------------------------------
662275b genext2fs: new switch name: --reserved-percentage; thanks, Zagiox

Summary of changes:
 helpers/lh_binary_rootfs |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 662275be9c18da5d182670c21e6e48bc273d8ef2
Author: Ben Armstrong <synrg at debian.org>
Date:   Tue Sep 25 14:59:23 2007 -0300

    genext2fs: new switch name: --reserved-percentage; thanks, Zagiox

diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 0fe9043..7871d77 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -112,10 +112,16 @@ case "${LH_CHROOT_FILESYSTEM}" in
 
 		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...
+		if [ "${LH_DISTRIBUTION}" = "etch" ]
+		then
+			RESERVED_PERCENTAGE="--reserved-blocks"
+		else
+			RESERVED_PERCENTAGE="--reserved-percentage"
+		fi
 
 		case "${LH_CHROOT_BUILD}" in
 			enabled)
-				Chroot "genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot filesystem.ext2"
+				Chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.ext2"
 
 				# Move image
 				mv chroot/filesystem.ext2 binary/${INITFS}
@@ -123,7 +129,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 				;;
 
 			disabled)
-				genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot binary/${INITFS}/filesystem.ext2
+				genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.ext2
 				;;
 		esac
 

-- 
debian-live/live-helper