[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 49f4d23bf89af431c787138641bdc6a61e042794
Author: Tails developers <amnesia at boum.org>
Date:   Mon Apr 9 16:06:55 2012 +0200

    Supress warnings when probing media for persistence.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 9a80b11..ee59247 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -743,6 +743,8 @@ try_mount ()
 mount_persistence_media ()
 {
 	local device=${1}
+	local probe=${2}
+
 	local backing="/live/persistence/$(basename ${device})"
 
 	mkdir -p "${backing}"
@@ -760,7 +762,8 @@ mount_persistence_media ()
 			echo ${backing}
 			return 0
 		else
-			log_warning_msg "Failed to mount persistence media ${device}"
+			[ -z "${probe}" ] && log_warning_msg "Failed to mount persistence media ${device}"
+			rmdir "${backing}"
 			return 1
 		fi
 	elif [ "${backing}" != "${old_backing}" ]
@@ -770,7 +773,8 @@ mount_persistence_media ()
 			echo ${backing}
 			return 0
 		else
-			log_warning_msg "Failed to move persistence media ${device}"
+			[ -z "${probe}" ] && log_warning_msg "Failed to move persistence media ${device}"
+			rmdir "${backing}"
 			return 1
 		fi
 	fi
@@ -906,7 +910,7 @@ probe_for_file_name ()
 	local dev="${3}"
 
 	local ret=""
-	local backing="$(mount_persistence_media ${dev})"
+	local backing="$(mount_persistence_media ${dev} probe)"
 	if [ -z "${backing}" ]
 	then
 	    return

-- 
live-boot