summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-03-19 23:04:41 +0100
committerDaniel Baumann <daniel@debian.org>2012-04-05 07:48:37 +0200
commitc318829194c0913f71a1c94463c49598ed80fda4 (patch)
tree2703248a32a569c895a4fbc9ff1ab661bba54cab
parent642591226c57f1902e6d159c0dea5bbee2afc572 (diff)
downloadlive-boot-c318829194c0913f71a1c94463c49598ed80fda4.tar.gz
live-boot-c318829194c0913f71a1c94463c49598ed80fda4.zip
Create the source dir for custom mounts using the 'linkfiles' option.
We can't bootstrap it, but creating it so the user doesn't have to (and maybe can't due to permissions) is a still convenient.
-rw-r--r--scripts/live-helpers7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 442f749..4be7d9d 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1398,12 +1398,13 @@ activate_custom_mounts ()
# dealing with /etc or other system dir.
if [ ! -d "${source}" ]
then
- if [ -n "${PERSISTENT_READONLY}" ] || [ -n "${opt_linkfiles}" ]
+ if [ -n "${PERSISTENT_READONLY}" ]
then
continue
- elif [ -n "${opt_union}" ]
+ elif [ -n "${opt_union}" ] || [ -n "${opt_linkfiles}" ]
then
- # union's don't need to be bootstrapped
+ # unions and don't need to be bootstrapped
+ # linkfiles dirs can't be bootstrapped in a sensible way
mkdir "${source}"
else
# ensure that $dest is not copied *into* $source