[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 c318829194c0913f71a1c94463c49598ed80fda4
Author: Tails developers <amnesia at boum.org>
Date:   Mon Mar 19 23:04:41 2012 +0100

    Create the source dir for custom mounts using the 'linkfiles' option.
    
    We can't bootstrap it, but creating it so the user doesn't have to
    (and maybe can't due to permissions) is a still convenient.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 442f749..4be7d9d 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1398,12 +1398,13 @@ activate_custom_mounts ()
 		# dealing with /etc or other system dir.
 		if [ ! -d "${source}" ]
 		then
-			if [ -n "${PERSISTENT_READONLY}" ] || [ -n "${opt_linkfiles}" ]
+			if [ -n "${PERSISTENT_READONLY}" ]
 			then
 				continue
-			elif [ -n "${opt_union}" ]
+			elif [ -n "${opt_union}" ] || [ -n "${opt_linkfiles}" ]
 			then
-				# union's don't need to be bootstrapped
+				# unions and don't need to be bootstrapped
+				# linkfiles dirs can't be bootstrapped in a sensible way
 				mkdir "${source}"
 			else
 				# ensure that $dest is not copied *into* $source

-- 
live-boot