[SCM] live-boot branch, debian, updated. debian/3.0_a25-1-72-gfc7a680

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 2c55cb63431dcecab209ed5c4f477fd8681b8530
Author: Tails developers <amnesia at boum.org>
Date:   Fri Feb 17 16:35:43 2012 +0100

    Remove two FIXME:s that are not really relevant.
    
    We could handle those cases, but it wouldn't give us anything; the
    sort-by-destination we do later makes it work just fine.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index be7cf76..f13be57 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1300,15 +1300,6 @@ get_custom_mounts ()
 				esac
 			done
 
-			# FIXME: handle case: we already have /a/b in
-			# $bindings added from current $device, but
-			# now we find /a -- /a should replace /a/b in
-			# $bindings.
-
-			# FIXME: handle case: we have /a in $bindings
-			# from current $device, now we find /a/b, so
-			# we skip /a/b
-
 			# ensure that no multiple-/ occur in paths
 			local full_source="$(echo ${backing}/${source}/ | sed -e 's|/\+|/|g')"
 			local full_dest="$(echo ${rootmnt}/${dest}/ | sed -e 's|/\+|/|g')"

-- 
live-boot