X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=456c2d75b1a14c20b53c5dfb47dc45302ccc06fe;hb=610c06cafd108f9af8d246988b9ce518aa2895f2;hp=442f7499b0e4ef81b41f312736d366a4664d840e;hpb=642591226c57f1902e6d159c0dea5bbee2afc572;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index 442f749..456c2d7 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -22,7 +22,7 @@ custom_overlay_label="custom-ov" root_snapshot_label="live-sn" old_root_snapshot_label="live-sn" home_snapshot_label="home-sn" -persistence_list="live.persist" +persistence_list="live-persistence.conf" Arguments () { @@ -89,9 +89,9 @@ Arguments () export FETCH ;; - forcepersistentfsck) - FORCEPERSISTENTFSCK="Yes" - export FORCEPERSISTENTFSCK + forcepersistencefsck) + FORCEPERSISTENCEFSCK="Yes" + export FORCEPERSISTENCEFSCK ;; ftpfs=*) @@ -143,6 +143,11 @@ Arguments () export STATICIP ;; + findiso=*) + FINDISO="${ARGUMENT#findiso=}" + export FINDISO + ;; + live-getty) LIVE_GETTY="1" export LIVE_GETTY @@ -188,8 +193,8 @@ Arguments () export NFSOPTS ;; - nfscow=*) - NFS_COW="${ARGUMENT#nfscow=}" + nfsoverlay=*) + NFS_COW="${ARGUMENT#nfsoverlay=}" export NFS_COW ;; @@ -222,52 +227,52 @@ Arguments () export SWAPON ;; - persistent) - PERSISTENT="Yes" - export PERSISTENT + persistence) + PERSISTENCE="Yes" + export PERSISTENCE ;; - persistent-encryption=*) - PERSISTENT_ENCRYPTION="${ARGUMENT#*=}" - export PERSISTENT_ENCRYPTION + persistence-encryption=*) + PERSISTENCE_ENCRYPTION="${ARGUMENT#*=}" + export PERSISTENCE_ENCRYPTION ;; - persistent-media=*) - PERSISTENT_MEDIA="${ARGUMENT#*=}" - export PERSISTENT_MEDIA + persistence-media=*) + PERSISTENCE_MEDIA="${ARGUMENT#*=}" + export PERSISTENCE_MEDIA ;; - persistent-method=*) - PERSISTENT_METHOD="${ARGUMENT#*=}" - export PERSISTENT_METHOD + persistence-method=*) + PERSISTENCE_METHOD="${ARGUMENT#*=}" + export PERSISTENCE_METHOD ;; - persistent-path=*) - PERSISTENT_PATH="${ARGUMENT#persistent-path=}" - export PERSISTENT_PATH + persistence-path=*) + PERSISTENCE_PATH="${ARGUMENT#persistence-path=}" + export PERSISTENCE_PATH ;; - persistent-read-only) - PERSISTENT_READONLY="Yes" - export PERSISTENT_READONLY + persistence-read-only) + PERSISTENCE_READONLY="Yes" + export PERSISTENCE_READONLY ;; - persistent-storage=*) - PERSISTENT_STORAGE="${ARGUMENT#persistent-storage=}" - export PERSISTENT_STORAGE + persistence-storage=*) + PERSISTENCE_STORAGE="${ARGUMENT#persistence-storage=}" + export PERSISTENCE_STORAGE ;; - persistent-subtext=*) - root_overlay_label="${root_overlay_label}-${ARGUMENT#persistent-subtext=}" - old_root_overlay_label="${old_root_overlay_label}-${ARGUMENT#persistent-subtext=}" - old_home_overlay_label="${old_home_overlay_label}-${ARGUMENT#persistent-subtext=}" - custom_overlay_label="${custom_overlay_label}-${ARGUMENT#persistent-subtext=}" - root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistent-subtext=}" - old_root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistent-subtext=}" - home_snapshot_label="${home_snapshot_label}-${ARGUMENT#persistent-subtext=}" + persistence-subtext=*) + root_overlay_label="${root_overlay_label}-${ARGUMENT#persistence-subtext=}" + old_root_overlay_label="${old_root_overlay_label}-${ARGUMENT#persistence-subtext=}" + old_home_overlay_label="${old_home_overlay_label}-${ARGUMENT#persistence-subtext=}" + custom_overlay_label="${custom_overlay_label}-${ARGUMENT#persistence-subtext=}" + root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistence-subtext=}" + old_root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistence-subtext=}" + home_snapshot_label="${home_snapshot_label}-${ARGUMENT#persistence-subtext=}" ;; - nopersistent) - NOPERSISTENT="Yes" - export NOPERSISTENT + nopersistence) + NOPERSISTENCE="Yes" + export NOPERSISTENCE ;; noprompt) @@ -381,37 +386,37 @@ Arguments () export UNIONTYPE fi - if [ -z "${PERSISTENT_ENCRYPTION}" ] + if [ -z "${PERSISTENCE_ENCRYPTION}" ] then - PERSISTENT_ENCRYPTION="none" - export PERSISTENT_ENCRYPTION - elif echo ${PERSISTENT_ENCRYPTION} | grep -qe "\" + PERSISTENCE_ENCRYPTION="none" + export PERSISTENCE_ENCRYPTION + elif echo ${PERSISTENCE_ENCRYPTION} | grep -qe "\" then if ! modprobe dm-crypt then log_warning_msg "Unable to load module dm-crypt" - PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\" && \ + if echo ${PERSISTENCE_ENCRYPTION} | grep -qe "\" && \ is_luks_partition ${dev} then if luks_device=$(open_luks_device "${dev}") @@ -975,14 +999,14 @@ find_persistent_media () # skip $dev since we failed/chose not to open it continue fi - elif echo ${PERSISTENT_ENCRYPTION} | grep -qve "\" + elif echo ${PERSISTENCE_ENCRYPTION} | grep -qve "\" then # skip $dev since we don't allow unencrypted storage continue fi # Probe for matching GPT partition names or filesystem labels - if echo ${PERSISTENT_STORAGE} | grep -qe "\" + if echo ${PERSISTENCE_STORAGE} | grep -qe "\" then result=$(probe_for_gpt_name "${overlays}" "${snapshots}" ${dev}) if [ -n "${result}" ] @@ -1000,7 +1024,7 @@ find_persistent_media () fi # Probe for files with matching name on mounted partition - if echo ${PERSISTENT_STORAGE} | grep -qe "\" + if echo ${PERSISTENCE_STORAGE} | grep -qe "\" then result=$(probe_for_file_name "${overlays}" "${snapshots}" ${dev}) if [ -n "${result}" ] @@ -1139,8 +1163,8 @@ link_files () # live-boot normally does (into $rootmnt)). # remove multiple /:s and ensure ending on / - local src_dir="$(echo "${1}"/ | sed -e 's|/\+|/|g')" - local dest_dir="$(echo "${2}"/ | sed -e 's|/\+|/|g')" + local src_dir="$(trim_path ${1})/" + local dest_dir="$(trim_path ${2})/" local src_mask="${3}" # This check can only trigger on the inital, non-recursive call since @@ -1162,18 +1186,19 @@ link_files () if [ ! -d "${dest}" ] then mkdir -p "${dest}" - prev="$(dirname "${dest}")" - chown --reference "${prev}" "${dest}" - chmod --reference "${prev}" "${dest}" + chown_ref "${src}" "${dest}" + chmod_ref "${src}" "${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 } @@ -1241,7 +1266,7 @@ do_union () get_custom_mounts () { - # Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistent + # Side-effect: leaves $devices with live-persistence.conf mounted in ${rootmnt}/live/persistence # Side-effect: prints info to file $custom_mounts local custom_mounts=${1} @@ -1260,7 +1285,7 @@ get_custom_mounts () fi local device_name="$(basename ${device})" - local backing=$(mount_persistent_media ${device}) + local backing=$(mount_persistence_media ${device}) if [ -z "${backing}" ] then continue @@ -1274,38 +1299,35 @@ get_custom_mounts () if [ -n "${DEBUG}" ] && [ -e "${include_list}" ] then - cp ${include_list} ${rootmnt}/live/persistent/${persistence_list}.${device_name} + cp ${include_list} ${rootmnt}/live/persistence/${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}" ] - 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 "^/\(.*/\)\?\.\.\?\(/.*\)\?$" + 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 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|bind) ;; *) log_warning_msg "Skipping custom mount with unkown option: ${opt}" @@ -1314,10 +1336,21 @@ 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) 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 "\"; + local full_dest="$(trim_path ${rootmnt}/${dir})" + if [ -n "${opt_linkfiles}" ] then echo "${device} ${full_source} ${full_dest} ${options}" >> ${links} else @@ -1333,7 +1366,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 persistence 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 () @@ -1343,128 +1393,163 @@ 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 "$(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 - # 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 + # if ${source} doesn't exist on our persistence media # we bootstrap it with $dest from the live filesystem. # this both makes sense and is critical if we're # dealing with /etc or other system dir. if [ ! -d "${source}" ] then - if [ -n "${PERSISTENT_READONLY}" ] || [ -n "${opt_linkfiles}" ] + if [ -n "${PERSISTENCE_READONLY}" ] then continue - elif [ -n "${opt_union}" ] + elif [ -n "${opt_union}" ] || [ -n "${opt_linkfiles}" ] + then + # unions and don't need to be bootstrapped + # linkfiles dirs can't be bootstrapped in a sensible way + mkdir -p "${source}" + chown_ref "${dest}" "${source}" + chmod_ref "${dest}" "${source}" + elif [ -n "${opt_bind}" ] then - # union's don't need to be bootstrapped - mkdir "${source}" - else # ensure that $dest is not copied *into* $source mkdir -p "$(dirname ${source})" cp -a "${dest}" "${source}" fi fi - rofs_dest_backing="" - for d in ${rootmnt}/live/rofs/* - do + # XXX: If CONFIG_AUFS_ROBR is added to the Debian kernel we can + # ignore the loop below and set rofs_dest_backing=$dest + local rofs_dest_backing="" + if [ -n "${opt_linkfiles}"] + then + for d in ${rootmnt}/live/rofs/* + do + if [ -n "${rootmnt}" ] + then + rofs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")" + else + rofs_dest_backing="${d}/${dest}" + fi + if [ -d "${rofs_dest_backing}" ] + then + break + else + rofs_dest_backing="" + fi + done + fi + + if [ -n "${opt_linkfiles}" ] && [ -z "${PERSISTENCE_READONLY}" ] + then + link_files ${source} ${dest} ${rootmnt} + elif [ -n "${opt_linkfiles}" ] && [ -n "${PERSISTENCE_READONLY}" ] + then + mkdir -p ${rootmnt}/live/persistence + local links_source=$(mktemp -d ${rootmnt}/live/persistence/links-source-XXXXXX) + chown_ref ${source} ${links_source} + chmod_ref ${source} ${links_source} + # We put the cow dir in the below strange place to + # make it absolutely certain that the link source + # has its own directory and isn't nested with some + # other custom mount (if so that mount's files would + # be linked, causing breakage. if [ -n "${rootmnt}" ] then - rofs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")" - else - rofs_dest_backing="${d}/${dest}" - fi - if [ -d "${rofs_dest_backing}" ] - then - break + local cow_dir="/overlay/live/persistence/$(basename ${links_source})" else - rofs_dest_backing="" + # This is happens if persistence is activated + # post boot + local cow_dir="/live/overlay/live/persistence/$(basename ${links_source})" fi - done - - if [ -z "${PERSISTENT_READONLY}" ] + mkdir -p ${cow_dir} + chown_ref "${source}" "${cow_dir}" + chmod_ref "${source}" "${cow_dir}" + do_union ${links_source} ${cow_dir} ${source} ${rofs_dest_backing} + link_files ${links_source} ${dest} ${rootmnt} + elif [ -n "${opt_union}" ] && [ -z "${PERSISTENCE_READONLY}" ] then - if [ -n "${opt_linkfiles}" ] - then - links_source="${source}" - links_dest="${dest}" - elif [ -n "${opt_union}" ] + do_union ${dest} ${source} ${rofs_dest_backing} + elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENCE_READONLY}" ] + then + mount --bind "${source}" "${dest}" + elif [ -n "${opt_bind}" -o -n "${opt_union}" ] && [ -n "${PERSISTENCE_READONLY}" ] + then + # bind-mount and union mount are handled the same + # in read-only mode, but note that rofs_dest_backing + # is non-empty (and necessary) only for unions + if [ -n "${rootmnt}" ] then - do_union ${dest} ${source} ${rofs_dest_backing} + local cow_dir="$(echo ${dest} | sed -e "s|^${rootmnt}|/overlay/|")" else - mount --bind "${source}" "${dest}" + # This is happens if persistence is activated + # post boot + local cow_dir="/live/overlay/${dest}" fi - else - if [ -n "${opt_linkfiles}" ] + if [ -e "${cow_dir}" ] && [ -z "${opt_linkfiles}" ] then - links_dest="${dest}" - dest="$(mktemp -d ${persistent_backing}/links_source-XXXXXX)" - links_source="${dest}" - fi - if [ -n "${rootmnt}" ] - then - cow_dir="$(echo ${dest} | sed -e "s|${rootmnt}|/cow/|")" - else - cow_dir="/live/cow/${dest}" + # 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 - if [ -n "${opt_linkfiles}" ] - then - link_files "${links_source}" "${links_dest}" "${rootmnt}" - fi - PERSISTENCE_IS_ON="1" export PERSISTENCE_IS_ON @@ -1481,12 +1566,12 @@ fix_home_rw_compatibility () { local device=${1} - if [ -n "${PERSISTENT_READONLY}" ] + if [ -n "${PERSISTENCE_READONLY}" ] then return fi - local backing="$(mount_persistent_media ${device})" + local backing="$(mount_persistence_media ${device})" if [ -z "${backing}" ] then return @@ -1496,6 +1581,18 @@ fix_home_rw_compatibility () if [ ! -r "${include_list}" ] then echo "# home-rw backwards compatibility: -/ /home" > "${include_list}" +/home source=." > "${include_list}" + fi +} + +is_mountpoint () { + + directory="$1" + + if [ $(stat -fc%d:%D "${directory}") != $(stat -fc%d:%D "${directory}/..") ] + then + return 0 + else + return 1 fi }