diff options
| author | Tails developers <amnesia@boum.org> | 2012-03-01 14:53:48 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-05 07:47:47 +0200 |
| commit | 11492e8c656455a7d7ba0219d0018b282792a9d4 (patch) | |
| tree | 399cb11c298fef28f444253499dae662feef2326 /scripts | |
| parent | c9942ec95d623173c331a6ff9431b6bb36f5fb0f (diff) | |
| download | live-boot-11492e8c656455a7d7ba0219d0018b282792a9d4.tar.gz live-boot-11492e8c656455a7d7ba0219d0018b282792a9d4.zip | |
Change live.persist syntax to "SOURCE [DEST [OPTIONS...]]".
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/live-helpers | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/scripts/live-helpers b/scripts/live-helpers index 797cae1..a0510ce 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -1276,24 +1276,20 @@ get_custom_mounts () continue fi - if echo ${dest} | grep -qe "^[^/]" - then - options="${dest}" - dest="${source}" - elif [ -z "${dest}" ] + if [ -z "${dest}" ] then dest="${source}" fi - if trim_path ${source} | grep -qe "^\(.*/\)\?\.\.\?\(/.*\)\?$" + if trim_path ${source} | grep -q -e "^[^/]" -e "^\(.*/\)\?\.\.\?\(/.*\)\?$" then - log_warning_msg "Skipping unsafe custom mount with source ${source}: the source is a relative or absolute path w.r.t. the persistent media root and cannot use \".\" or \"..\"" + log_warning_msg "Skipping unsafe custom mount with source ${source}: the source must be an absolute path w.r.t. the persistent media root and cannot contain \".\" or \"..\"" continue fi - if trim_path ${dest} | grep -q -e "^/$" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$" + if trim_path ${dest} | grep -q -e "^[^/]" -e "^/$" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$" then - log_warning_msg "Skipping unsafe custom mount with desination ${dest}: the destination must be an absolute path using neither \".\" nor \"..\", and cannot be /live (or any sub-directory therein) or / (for the latter, use ${root_overlay_label}-type persistence instead)" + log_warning_msg "Skipping unsafe custom mount with desination ${dest}: the destination must be an absolute path containing neither \".\" nor \"..\", and cannot be /live (or any sub-directory therein) or / (for the latter, use ${root_overlay_label}-type persistence instead)" continue fi |