[SCM] live-boot branch, debian-next, updated. debian/3.0_a26-1-25-g79c2ffc

[Tails developers]

The following commit has been merged in the debian-next branch:
commit 79c2ffc7d8dd768a312d4f98b0809a2852d02699
Author: Tails developers <amnesia at boum.org>
Date:   Mon Apr 9 16:11:16 2012 +0200

    Only try copying snapshots if we actually found any.

diff --git a/scripts/live b/scripts/live
index 772ccc5..780c5de 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1215,9 +1215,9 @@ setup_unionfs ()
 		done
 
 		# Look for other snapshots to copy in
-		try_snap "${root_snapdata}" "${rootmnt}" "ROOT"
+		[ -n "${root_snapdata}" ] && try_snap "${root_snapdata}" "${rootmnt}" "ROOT"
 		# This second type should be removed when snapshot grow smarter
-		try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
+		[ -n "${home_snapdata}" ] && try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
 	fi
 
 	mkdir -p "${rootmnt}/live"

-- 
live-boot