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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 8b3ccc55856039a150b0d06c4dce24c50020a8fd
Author: Tails developers <amnesia at boum.org>
Date:   Thu Mar 22 14:20:32 2012 +0100

    Improve error message.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 52f812c..db6d25c 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1317,7 +1317,7 @@ get_custom_mounts ()
 			then
 				if echo ${opt_source} | grep -q -e "^/" -e "^\(.*/\)\?\.\.\?\(/.*\)\?$" && [ "${source}" != "." ]
 				then
-					log_warning_msg "Skipping unsafe custom mount with option source=${opt_source}: must be either \".\" (the media root) a relative path w.r.t. the media root that doesn't contain comas or the special dirs \".\" and \"..\""
+					log_warning_msg "Skipping unsafe custom mount with option source=${opt_source}: must be either \".\" (the media root) or a relative path w.r.t. the media root that contains neither comas, nor the special \".\" and \"..\" path components"
 					continue
 				else
 					source="${opt_source}"

-- 
live-boot