X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=75fc10648e1969b8e22d716d3ec8cb2e1688fb37;hb=2d129205223e1fb6322bb03a9cb9fdf1736885b8;hp=797cae1e868ecfc37c02410f051fdfc4b3b67817;hpb=c9942ec95d623173c331a6ff9431b6bb36f5fb0f;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index 797cae1..75fc106 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -519,8 +519,9 @@ where_is_mounted () } 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 () @@ -764,6 +765,22 @@ mount_persistent_media () return 0 } +close_persistent_media () { + local device=${1} + local backing="$(where_is_mounted ${device})" + + if [ -d "${backing}" ] + then + umount "${backing}" >/dev/null 2>&1 + rmdir "${backing}" >/dev/null 2>&1 + fi + + if is_active_luks_mapping ${device} + then + /sbin/cryptsetup luksClose ${device} + fi +} + open_luks_device () { dev="${1}" @@ -947,7 +964,7 @@ find_persistent_media () local luks_device="" # Check if it's a luks device; we'll have to open the device # in order to probe any filesystem it contains, like we do - # below. do_custom_mounts() also depends on that any luks + # below. activate_custom_mounts() also depends on that any luks # device already has been opened. if echo ${PERSISTENT_ENCRYPTION} | grep -qe "\" && \ is_luks_partition ${dev} @@ -1244,7 +1261,6 @@ get_custom_mounts () fi local device_name="$(basename ${device})" - local device_used="" local backing=$(mount_persistent_media ${device}) if [ -z "${backing}" ] then @@ -1254,12 +1270,6 @@ get_custom_mounts () local include_list="${backing}/${persistence_list}" if [ ! -r "${include_list}" ] then - umount "${backing}" >/dev/null 2>&1 - rmdir "${backing}" >/dev/null 2>&1 - if /sbin/cryptsetup status ${device_name} >/dev/null 2>&1 - then - /sbin/cryptsetup luksClose "${device_name}" - fi continue fi @@ -1268,39 +1278,32 @@ get_custom_mounts () 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 echo ${dest} | grep -qe "^[^/]" - then - options="${dest}" - dest="${source}" - elif [ -z "${dest}" ] - then - dest="${source}" - fi - - if trim_path ${source} | grep -qe "^\(.*/\)\?\.\.\?\(/.*\)\?$" - 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 \"..\"" - continue - fi - - if trim_path ${dest} | grep -q -e "^/$" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$" + if trim_path ${dir} | 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 ${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}" @@ -1309,42 +1312,45 @@ get_custom_mounts () 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) a relative path w.r.t. the media root that doesn't contain comas or the special dirs \".\" and \"..\"" + continue + else + source="${opt_source}" + fi + fi + local full_source="$(trim_path ${backing}/${source})" - local full_dest="$(trim_path ${rootmnt}/${dest})" - device_used="yes" - if echo ${options} | grep -qe "\"; + local full_dest="$(trim_path ${rootmnt}/${dir})" + if [ -n "${opt_linkfiles}" ] then - echo "${full_source} ${full_dest} ${options}" >> ${links} + echo "${device} ${full_source} ${full_dest} ${options}" >> ${links} else - echo "${full_source} ${full_dest} ${options}" >> ${bindings} + echo "${device} ${full_source} ${full_dest} ${options}" >> ${bindings} fi done < ${include_list} - - if [ -z "${device_used}" ] - then - # this device was not used for / earlier, or - # custom mount point now, so it's useless - umount "${backing}" - rmdir "${backing}" - fi done # We sort the list according to destination so we're sure that # we won't hide a previous mount. We also ignore duplicate # destinations in a more or less arbitrary way. - [ -e "${bindings}" ] && sort -k2 -sbu ${bindings} >> ${custom_mounts} && rm ${bindings} + [ -e "${bindings}" ] && sort -k3 -sbu ${bindings} >> ${custom_mounts} && rm ${bindings} # After all mounts are considered we add symlinks so they # won't be hidden by some mount. - [ -e "${links}" ] && sort -k2 -sbu ${links} >> ${custom_mounts} && rm ${links} + [ -e "${links}" ] && sort -k3 -sbu ${links} >> ${custom_mounts} && rm ${links} } -do_custom_mounts () +activate_custom_mounts () { local custom_mounts="${1}" # the ouput from get_custom_mounts() + local used_devices="" - while read source dest options # < ${custom_mounts} + while read device source dest options # < ${custom_mounts} do local opt_linkfiles="" local opt_union="" @@ -1360,9 +1366,14 @@ do_custom_mounts () esac done + if [ -n "${opt_linkfiles}" ] && [ -n "${opt_union}" ] + then + log_warning_msg "Skipping custom mount ${dest} with options ${options}: \"linkfiles\" and \"union\" are mutually exclusive options" + fi + 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 @@ -1401,13 +1412,16 @@ do_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}" + chown --reference "${dest}" "${source}" + chmod --reference "${dest}" "${source}" else # ensure that $dest is not copied *into* $source mkdir -p "$(dirname ${source})" @@ -1415,6 +1429,8 @@ do_custom_mounts () 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 @@ -1470,7 +1486,14 @@ do_custom_mounts () PERSISTENCE_IS_ON="1" export PERSISTENCE_IS_ON + + if echo ${used_devices} | grep -qve "^\(.* \)\?${device}\( .*\)\?$" + then + used_devices="${used_devices} ${device}" + fi done < ${custom_mounts} + + echo ${used_devices} } fix_home_rw_compatibility () @@ -1492,6 +1515,6 @@ fix_home_rw_compatibility () if [ ! -r "${include_list}" ] then echo "# home-rw backwards compatibility: -/ /home" > "${include_list}" +/home source=." > "${include_list}" fi }