[SCM] live-boot branch, debian-next, updated. debian/3.0_a25-1-22-g9ab12ed

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 9ab12eda9ed52faf41b3cad8c99e1775433f47e9
Author: Tails developers <amnesia at boum.org>
Date:   Thu Feb 9 12:16:56 2012 +0100

    Ignore empty lines in live.persist.
    
    Otherwise they're interpreted as / which isn't good.

diff --git a/scripts/live b/scripts/live
index d774284..7be2fcc 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1603,9 +1603,9 @@ setup_unionfs ()
 			[ "${DEBUG}" = "Yes" ] && cp ${include_list} ${persistent_backing}/${persistence_list}.${device_name}
 			while read source dest options # < ${include_list}
 			do
-				if echo ${source} | grep -qe "^[[:space:]]*#"
+				if echo ${source} | grep -qe "^[[:space:]]*\(#.*\)\?$"
 				then
-					# skipping commented line
+					# skipping empty or commented lines
 					continue
 				fi
 

-- 
live-boot