[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 268ad5d5b86fa0d7d7202a96113ef5167d855ec7
Author: Tails developers <amnesia at boum.org>
Date:   Mon Mar 26 19:21:40 2012 +0200

    Use trim_path() instead of custom sed stanza to trim /:es from paths.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index d8bd613..ffc2025 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1158,8 +1158,8 @@ link_files ()
 	# live-boot normally does (into $rootmnt)).
 
 	# remove multiple /:s and ensure ending on /
-	local src_dir="$(echo "${1}"/ | sed -e 's|/\+|/|g')"
-	local dest_dir="$(echo "${2}"/ | sed -e 's|/\+|/|g')"
+	local src_dir="$(trim_path ${1})/"
+	local dest_dir="$(trim_path ${2})/"
 	local src_mask="${3}"
 
 	# This check can only trigger on the inital, non-recursive call since

-- 
live-boot