projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8805080
)
Use trim_path when we compare paths.
author
Tails developers
<amnesia@boum.org>
Mon, 20 Feb 2012 10:51:14 +0000
(11:51 +0100)
committer
Daniel Baumann
<daniel@debian.org>
Thu, 5 Apr 2012 05:47:08 +0000
(07:47 +0200)
scripts/live-helpers
patch
|
blob
|
history
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
26783f1
..
795de55
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-1306,8
+1306,8
@@
get_custom_mounts ()
done
# ensure that no multiple-/ occur in paths
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
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
# 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')
then
path="/"
for dir in $(echo ${dest} | sed -e 's|/\+| |g')