[SCM] live-boot branch, debian, updated. debian/3.0_a25-1-72-gfc7a680
Daniel Baumann
daniel at debian.org
Thu Apr 5 06:21:41 UTC 2012
The following commit has been merged in the debian branch:
commit 7a8eabff4eab223553420e5ee3857d15b84559a1
Author: Tails developers <amnesia at boum.org>
Date: Mon Feb 20 11:51:14 2012 +0100
Use trim_path when we compare paths.
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 26783f1..795de55 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1306,8 +1306,8 @@ get_custom_mounts ()
done
# 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')"
+ local full_source="$(trim_path ${backing}/${source})"
+ local full_dest="$(trim_path ${rootmnt}/${dest})"
device_used="yes"
if echo ${options} | grep -qe "\<linkfiles\>";
then
@@ -1373,7 +1373,7 @@ do_custom_mounts ()
# FIXME: this should really be handled by
# live-config since we don't know for sure
# which uid a certain user has until then
- if echo ${dest} | grep -qe "^${rootmnt}/*home/\+[^/]\+"
+ if trim_path ${dest} | grep -qe "^${rootmnt}/*home/[^/]\+"
then
path="/"
for dir in $(echo ${dest} | sed -e 's|/\+| |g')
--
live-boot
More information about the debian-live-changes
mailing list