[SCM] live-boot branch, tmp-persistent-custom, updated. debian/3.0_a24-1-5-ga02df38

[Tails developers]

The following commit has been merged in the tmp-persistent-custom branch:
commit a5c0f50c2a79844ba21af9f07395f0d8744e28c2
Author: Tails developers <amnesia at boum.org>
Date:   Mon Feb 6 11:22:05 2012 +0100

    Prevent custom mounting in /live.

diff --git a/scripts/live b/scripts/live
index 1c45b61..5d033f6 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1632,9 +1632,10 @@ setup_unionfs ()
 				then
 					dest="${source}"
 				fi
-				if echo ${dest} | grep -qe "^/\+$"
+				if echo ${dest} | grep -qe "^/\+$\|^/\+live\(/.*\)\?$"
 				then
-					log_warning_msg "Skipping custom mount on /"
+					# mounting on / or /live could cause trouble
+					log_warning_msg "Skipping unsafe custom mount on ${dest}"
 					continue
 				fi
 

-- 
live-boot