}
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 ()
cp ${include_list} ${rootmnt}/live/persistent/${persistence_list}.${device_name}
fi
- while read source dest options # < ${include_list}
+ while read dir options # < ${include_list}
do
- if echo ${source} | grep -qe "^[[:space:]]*\(#.*\)\?$"
+ if echo ${dir} | grep -qe "^[[:space:]]*\(#.*\)\?$"
then
# skipping empty or commented lines
continue
fi
- if [ -z "${dest}" ]
+ if trim_path ${dir} | grep -q -e "^[^/]" -e "^/$" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
then
- dest="${source}"
- fi
-
- if trim_path ${source} | grep -q -e "^[^/]" -e "^\(.*/\)\?\.\.\?\(/.*\)\?$"
- then
- 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 "^/$" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
- then
- 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)"
+ log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/live\" (or any sub-directory therein) or \"/\" (for the latter, use ${root_overlay_label}-type persistence)"
continue
fi
+ local opt_source=""
+ local opt_linkfiles=""
for opt in $(echo ${options} | tr ',' ' ');
do
case "${opt}" in
- linkfiles|union)
+ source=*)
+ opt_source=${opt#source=}
+ ;;
+ linkfiles)
+ opt_linkfiles="yes"
+ ;;
+ union)
;;
*)
log_warning_msg "Skipping custom mount with unkown option: ${opt}"
esac
done
- # ensure that no multiple-/ occur in paths
+ local source="${dir}"
+ if [ -n "${opt_source}" ]
+ then
+ if echo ${opt_source} | grep -q -e "^/" -e "^\(.*/\)\?\.\.\?\(/.*\)\?$" && [ "${source}" != "." ]
+ then
+ log_warning_msg "Skipping unsafe custom mount with option source=${opt_source}: must be either \".\" (the media root) or a relative path w.r.t. the media root that contains neither comas, nor the special \".\" and \"..\" path components"
+ continue
+ else
+ source="${opt_source}"
+ fi
+ fi
+
local full_source="$(trim_path ${backing}/${source})"
- local full_dest="$(trim_path ${rootmnt}/${dest})"
- if echo ${options} | grep -qe "\<linkfiles\>";
+ local full_dest="$(trim_path ${rootmnt}/${dir})"
+ if [ -n "${opt_linkfiles}" ]
then
echo "${device} ${full_source} ${full_dest} ${options}" >> ${links}
else
# After all mounts are considered we add symlinks so they
# won't be hidden by some mount.
- [ -e "${links}" ] && sort -k3 -sbu ${links} >> ${custom_mounts} && rm ${links}
+ [ -e "${links}" ] && cat ${links} >> ${custom_mounts} && rm ${links}
+
+ # We need to make sure that no two custom mounts have the same sources
+ # or are nested; if that is the case, too much weird stuff can happen.
+ local prev_source="impossible source" # first iteration must not match
+ local prev_dest=""
+ # This sort will ensure that a source /a comes right before a source
+ # /a/b so we only need to look at the previous source
+ sort -k2 -b ${custom_mounts} |
+ while read device source dest options
+ do
+ if echo ${source} | grep -qe "^${prev_source}\(/.*\)\?$"
+ then
+ panic "Two persistent mounts have the same or nested sources: ${source} on ${dest}, and ${prev_source} on ${prev_dest}"
+ fi
+ prev_source=${source}
+ prev_dest=${dest}
+ done
}
activate_custom_mounts ()
local opt_union=""
for opt in $(echo ${options} | tr ',' ' ');
do
- case "${opt}" in
+ case "${opt}" in
linkfiles)
opt_linkfiles="yes"
;;
if [ -n "$(what_is_mounted_on "${dest}")" ]
then
- log_warning_msg "Skipping custom mount ${source} on ${dest}: $(what_is_mounted_on "${dest}") is already mounted there"
+ log_warning_msg "Skipping custom mount ${dest}: $(what_is_mounted_on "${dest}") is already mounted there"
continue
fi
then
# unions and don't need to be bootstrapped
# linkfiles dirs can't be bootstrapped in a sensible way
- mkdir "${source}"
+ mkdir -p "${source}"
chown --reference "${dest}" "${source}"
chmod --reference "${dest}" "${source}"
else
fi
fi
+ # XXX: If CONFIG_AUFS_ROBR is added to the Debian kernel we can
+ # ignore the loop below and set rofs_dest_backing=$dest
rofs_dest_backing=""
for d in ${rootmnt}/live/rofs/*
do
else
cow_dir="/live/cow/${dest}"
fi
+ if [ -e "${cow_dir}" ]
+ then
+ # If an earlier custom mount has files here
+ # it will "block" the current mount's files
+ # which is undesirable
+ rm -rf "${cow_dir}"
+ fi
mkdir -p ${cow_dir}
chown --reference "${source}" "${cow_dir}"
chmod --reference "${source}" "${cow_dir}"
if [ ! -r "${include_list}" ]
then
echo "# home-rw backwards compatibility:
-/ /home" > "${include_list}"
+/home source=." > "${include_list}"
fi
}
projects / live-boot-grml.git / blobdiff