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

[Daniel Baumann]

The following commit has been merged in the master branch:
commit cc2cf994d4887c19b8f10e122957c6bbd137fe7d
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Mar 2 11:12:02 2008 +0100

    Also handling ext3 in lh_binary_rootfs, thanks to Bas Wijnen <wijnen at debian.org> (Closes: #468902).

diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 97cdaab..1108228 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -94,7 +94,7 @@ do
 done
 
 case "${LH_CHROOT_FILESYSTEM}" in
-	ext2)
+	ext2|ext3)
 		# Checking depends
 		Check_package chroot/usr/bin/genext2fs genext2fs
 
@@ -104,10 +104,10 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		# Installing depends
 		Install_package
 
-		# Remove old ext2 image
-		if [ -f binary/${INITFS}/filesystem.ext2 ]
+		# Remove old image
+		if [ -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} ]
 		then
-			rm -f binary/${INITFS}/filesystem.ext2
+			rm -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
 		fi
 
 		DU_DIM="$(du -ks chroot/chroot | cut -f1)"
@@ -121,15 +121,15 @@ case "${LH_CHROOT_FILESYSTEM}" in
 
 		case "${LH_CHROOT_BUILD}" in
 			enabled)
-				Chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.ext2"
+				Chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LH_CHROOT_FILESYSTEM}"
 
 				# Move image
-				mv chroot/filesystem.ext2 binary/${INITFS}
+				mv chroot/filesystem.${LH_CHROOT_FILESYSTEM} binary/${INITFS}
 				rm -rf chroot/chroot
 				;;
 
 			disabled)
-				genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.ext2
+				genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
 				;;
 		esac
 

-- 
debian-live/live-helper