X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=d8bd613998356a74160a341ff8d89005c810bf0a;hb=161e3e634a4f975f4d72fc2cfd715d9741fe9d16;hp=75fc10648e1969b8e22d716d3ec8cb2e1688fb37;hpb=2d129205223e1fb6322bb03a9cb9fdf1736885b8;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index 75fc106..d8bd613 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -530,6 +530,24 @@ what_is_mounted_on () grep -m1 "^[^ ]\+ ${dir} " /proc/mounts | cut -d' ' -f1 } +chown_ref () +{ + local reference="${1}" + shift + local targets=${@} + local owner=$(stat -c %u:%g "${reference}") + chown -h ${owner} ${targets} +} + +chmod_ref () +{ + local reference="${1}" + shift + local targets=${@} + local rights=$(stat -c %a "${reference}") + chmod ${rights} ${targets} +} + lastline () { while read lines @@ -1164,17 +1182,19 @@ link_files () then mkdir -p "${dest}" prev="$(dirname "${dest}")" - chown --reference "${prev}" "${dest}" - chmod --reference "${prev}" "${dest}" + chown_ref "${prev}" "${dest}" + chmod_ref "${prev}" "${dest}" fi link_files "${src}" "${dest}" "${src_mask}" else + local final_src=${src} if [ -n "${src_mask}" ] then - src="$(echo ${src} | sed "s|^${src_mask}||")" + final_src="$(echo ${final_src} | sed "s|^${src_mask}||")" fi rm -rf "${dest}" 2> /dev/null - ln -s "${src}" "${dest}" + ln -s "${final_src}" "${dest}" + chown_ref "${src}" "${dest}" fi done } @@ -1303,7 +1323,7 @@ get_custom_mounts () linkfiles) opt_linkfiles="yes" ;; - union) + union|bind) ;; *) log_warning_msg "Skipping custom mount with unkown option: ${opt}" @@ -1317,7 +1337,7 @@ get_custom_mounts () 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 \"..\"" + 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}" @@ -1342,7 +1362,24 @@ get_custom_mounts () # 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 () @@ -1352,58 +1389,56 @@ activate_custom_mounts () while read device source dest options # < ${custom_mounts} do + local opt_bind="yes" local opt_linkfiles="" local opt_union="" for opt in $(echo ${options} | tr ',' ' '); do - case "${opt}" in + case "${opt}" in + bind) + opt_bind="yes" + unset opt_linkfiles opt_union + ;; linkfiles) opt_linkfiles="yes" + unset opt_bind opt_union ;; union) opt_union="yes" + unset opt_bind opt_linkfiles ;; 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 ${dest}: $(what_is_mounted_on "${dest}") is already mounted there" continue fi - # FIXME: we don't handle already existing - # non-directory files in the paths of both $source and - # $dest. - if [ ! -d "${dest}" ] then - # if ${dest} is in /home/$user, try fixing - # proper ownership - # 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 trim_path ${dest} | grep -qe "^${rootmnt}/*home/[^/]\+" - then - path="/" - for dir in $(echo ${dest} | sed -e 's|/\+| |g') - do - path=${path}/${dir} - if [ ! -e ${path} ] + # create the destination and delete existing files in + # its path that are in the way + path="/" + for dir in $(echo ${dest} | sed -e 's|/\+| |g') + do + path=$(trim_path ${path}/${dir}) + if [ -f ${path} ] + then + rm -f ${path} + fi + if [ ! -e ${path} ] + then + mkdir -p ${path} + if echo ${path} | grep -qe "^${rootmnt}/*home/[^/]\+" then - mkdir -p ${path} - # assume that the intended user is the first, which is usually the case + # if ${dest} is in /home try fixing proper ownership by assuming that the intended user is the first, which is usually the case + # FIXME: this should really be handled by live-config since we don't know for sure which uid a certain user has until then chown 1000:1000 ${path} fi - done - else - mkdir -p ${dest} - fi + fi + done fi # if ${source} doesn't exist on our persistent media @@ -1419,10 +1454,11 @@ activate_custom_mounts () then # 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 + mkdir -p "${source}" + chown_ref "${dest}" "${source}" + chmod_ref "${dest}" "${source}" + elif [ -n "${opt_bind}" ] + then # ensure that $dest is not copied *into* $source mkdir -p "$(dirname ${source})" cp -a "${dest}" "${source}" @@ -1473,9 +1509,16 @@ activate_custom_mounts () 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}" + chown_ref "${source}" "${cow_dir}" + chmod_ref "${source}" "${cow_dir}" do_union ${dest} ${cow_dir} ${source} ${rofs_dest_backing} fi