[SCM] live-boot branch, debian-next, updated. debian/3.0_a24-1-2-gb981b86

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit b981b862888aa4b345e6af8a1af65253378919b7
Author: Michal Suchanek <hramrach at centrum.cz>
Date:   Fri Apr 15 11:36:00 2011 +0200

    Add overlayfs support (Closes: #658265).

diff --git a/hooks/live b/hooks/live
index b023d4b..bb72534 100755
--- a/hooks/live
+++ b/hooks/live
@@ -145,6 +145,7 @@ manual_add_modules unlzma
 manual_add_modules aufs
 manual_add_modules overlayfs
 manual_add_modules unionfs
+manual_add_modules overlayfs
 
 # Filesystem: unionfs-fuse
 if [ -x /usr/bin/unionfs-fuse ]
diff --git a/scripts/live b/scripts/live
index 8ffbc20..5af7ad8 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1208,7 +1208,7 @@ setup_unionfs ()
 	addimage_directory="${3}"
 
 	case ${UNIONTYPE} in
-		aufs|unionfs)
+		aufs|unionfs|overlayfs)
 			modprobe -q -b ${UNIONTYPE}
 
 			if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ]
@@ -1570,6 +1570,10 @@ setup_unionfs ()
 				mount_full $unionmountopts "${unionmountpoint}"
 				;;
 
+			overlayfs)
+				unionmountopts="-o noatime,${noxino_opt},lowerdir=${unionro},upperdir=${unionrw}"
+				mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
+				;;
 
 			*)
 				if [ -n "${PERSISTENT_READONLY}" ]

-- 
live-boot