[SCM] live-boot branch, tmp-persistent-custom, updated. debian/3.0_a25-1-30-g5fc05fe

[Tails developers]

The following commit has been merged in the tmp-persistent-custom branch:
commit 267af2822e53dffafd11931312280fc2976cf46a
Author: Tails developers <amnesia at boum.org>
Date:   Sat Feb 11 21:30:53 2012 +0100

    Use same device backing path as used in other places.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 82fe705..344db73 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -373,6 +373,7 @@ find_persistent_media ()
 	snapshots="${2}"
 	black_listed_devices="${3}"
 	white_listed_devices="${4}"
+	persistent_backing="${rootmnt}/live/persistent"
 
 	for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
 	do
@@ -413,7 +414,7 @@ find_persistent_media ()
 			devfstype="$(get_fstype ${dev})"
 			overlay_on_dev=""
 			snapshot_on_dev=""
-			backing="/$(basename ${dev})-backing"
+			backing="${persistent_backing}/$(basename ${dev})"
 			mkdir -p "${backing}"
 			if is_supported_fs ${devfstype} && try_mount "${dev}" "${backing}" "rw" "${devfstype}"
 			then

-- 
live-boot