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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 916c9458ead4b3a2c227ff625483ac7470805ee6
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 821103a..d9a8972 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1636,9 +1636,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