[SCM] live-boot branch, debian, updated. debian/2.0_a11-1-7-ge2ba97a

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit fa4e3b7531b58edc082487cba75f772121a21201
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 7 13:44:12 2010 +0200

    Adding btrfs support.

diff --git a/hooks/live b/hooks/live
index 4f11998..16a2d0c 100755
--- a/hooks/live
+++ b/hooks/live
@@ -84,6 +84,9 @@ then
 	uuidgen -r > "${DESTDIR}"/conf/uuid.conf
 fi
 
+# Filesystem: btrfs
+manual_add_modules btrfs
+
 # Filesystem: cifs
 if [ -x /sbin/mount.cifs ]
 then
diff --git a/scripts/live b/scripts/live
index 11ad984..f5f4ad2 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1595,6 +1595,7 @@ find_livefs ()
 				fi
 			done
 		elif [ "${fstype}" = "squashfs" -o \
+			"${fstype}" = "btrfs" -o \
 			"${fstype}" = "ext2" -o \
 			"${fstype}" = "ext3" -o \
 			"${fstype}" = "ext4" -o \

-- 
live-boot