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

[Tails developers]

The following commit has been merged in the tmp-persistent-custom branch:
commit 76e85e8c0f01db3622223f80aac7c27dbe71fb59
Author: Tails developers <amnesia at boum.org>
Date:   Tue Mar 20 17:36:18 2012 +0100

    Make trim_path() handle "/", and arbitrarily many consequituve /:es.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 1f2fb80..75fc106 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -519,8 +519,9 @@ where_is_mounted ()
 }
 
 trim_path () {
-    # remove all unnecessary /:s in the path, including last
-    echo ${1} | sed 's|//|/|g' | sed 's|/$||'
+    # remove all unnecessary /:s in the path, including last one (except
+    # if path is just "/")
+    echo ${1} | sed 's|//\+|/|g' | sed 's|^\(.*[^/]\)/$|\1|'
 }
 
 what_is_mounted_on ()

-- 
live-boot