X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=077ad52d94de0f12407ab337e44b86892d5b3e2e;hb=a844e2f2b5c126e6f3e54a65e69b8673553afdf3;hp=5af7ad8e93dedb6047859ce68f4c3eea56c12851;hpb=2b913a034efc31da458036087245591cb6aa6f47;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index 5af7ad8..077ad52 100755 --- a/scripts/live +++ b/scripts/live @@ -11,10 +11,11 @@ mountpoint="/live/image" alt_mountpoint="/media" LIVE_MEDIA_PATH="live" -root_persistence="live-rw" -home_persistence="home-rw" +root_overlay_label="full-ov" +custom_overlay_label="custom-ov" root_snapshot_label="live-sn" home_snapshot_label="home-sn" +persistence_list="live.persist" USERNAME="user" USERFULLNAME="Live user" @@ -273,8 +274,8 @@ Arguments () ;; persistent-subtext=*) - root_persistence="${root_persistence}-${ARGUMENT#persistent-subtext=}" - home_persistence="${home_persistence}-${ARGUMENT#persistent-subtext=}" + root_overlay_label="${root_overlay_label}-${ARGUMENT#persistent-subtext=}" + custom_overlay_label="${custom_overlay_label}-${ARGUMENT#persistent-subtext=}" root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistent-subtext=}" home_snapshot_label="${home_snapshot_label}-${ARGUMENT#persistent-subtext=}" ;; @@ -854,7 +855,7 @@ do_iscsi() #modprobe ib_iser modprobe iscsi_tcp local debugopt="" - [ "${DEBUG}" == "Yes" ] && debugopt="-d 8" + [ "${DEBUG}" = "Yes" ] && debugopt="-d 8" #FIXME this name is supposed to be unique - some date + ifconfig hash? ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)" export ISCSI_INITIATORNAME @@ -1360,7 +1361,7 @@ setup_unionfs () mkdir -p /cow - # Looking for "${root_persistence}" device or file + # Looking for persistent devices or files if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] then @@ -1405,7 +1406,7 @@ setup_unionfs () if echo ${PERSISTENT_METHOD} | grep -qe "\" then - overlays="${root_persistence} ${home_persistence}" + overlays="${root_overlay_label} ${custom_overlay_label}" fi if echo ${PERSISTENT_METHOD} | grep -qe "\" @@ -1413,17 +1414,11 @@ setup_unionfs () snapshots="${root_snapshot_label} ${home_snapshot_label}" fi - + overlay_devices="" for media in $(find_persistent_media "${overlays}" "${snapshots}" "${blacklistdev}" "${whitelistdev}") do media="$(echo ${media} | tr ":" " ")" case ${media} in - ${root_persistence}=*) - cowprobe="${media#*=}" - ;; - ${home_persistence}=*) - homecow="${media#*=}" - ;; ${root_snapshot_label}=*) root_snapdata="${media#*=}" ;; @@ -1433,21 +1428,24 @@ setup_unionfs () # ext2|ext3|ext4|jffs2 snapshot types. home_snapdata="${media#*=}" ;; - *) + ${root_overlay_label}=*) + device="${media#*=}" + root_overlay_device="${device}" + ;; + ${custom_overlay_label}=*) + device="${media#*=}" + overlay_devices="${overlay_devices} ${device}" ;; esac done - if [ -b "${cowprobe}" ] || [ -b "${homecow}" ] + if [ -b "${root_overlay_device}" ] then PERSISTENCE_IS_ON="1" export PERSISTENCE_IS_ON - fi - if [ -b "${cowprobe}" ] - then - cowdevice=${cowprobe} - cow_fstype=$(get_fstype "${cowprobe}") + cowdevice=${root_overlay_device} + cow_fstype=$(get_fstype "${root_overlay_device}") if [ -z "${PERSISTENT_READONLY}" ] then cow_mountopt="rw,noatime" @@ -1600,26 +1598,193 @@ setup_unionfs () # Adding other custom mounts if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] then - # directly mount /home - # FIXME: add a custom mounts configurable system + bindings="/bindings.list" + links="/links.list" + custom_mounts="/custom_mounts.list" + rm -f ${bindings} ${links} ${custom_mounts} >/dev/null 2>&1 + persistent_backing="${rootmnt}/live/persistent" - if [ -b "${homecow}" ] - then + # First we scan all media and gather all information about custom mounts + for device in ${overlay_devices} + do + if [ ! -b "${device}" ] + then + continue + fi + device_name="$(basename ${device})" + backing="${persistent_backing}/${device_name}" + mkdir -p "${backing}" + device_fstype="$(get_fstype ${device})" if [ -z "${PERSISTENT_READONLY}" ] then - mount -t $(get_fstype "${homecow}") -o rw,noatime "${homecow}" "${rootmnt}/home" + device_mount_opts="rw,noatime" else - homerw="/cow/home" - homero="/$(basename ${homecow})-backing" - homemountpoint="${rootmnt}/home" - mkdir -p ${homerw} ${homero} ${homemountpoint} - mount -t $(get_fstype "${homecow}") -o ro "${homecow}" "${homero}" - mount -t "${UNIONTYPE}" -o "noatime,${noxino_opt}dirs=${homerw}=rw:${homero}=${roopt}" "${UNIONTYPE}" "${homemountpoint}" + device_mount_opts="ro,noatime" fi - export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy() - else - log_warning_msg "Unable to find the persistent home medium" - fi + device_used="" + mount -t "${device_fstype}" -o "${device_mount_opts}" "${device}" "${backing}" + include_list="${backing}/${persistence_list}" + if [ ! -r "${include_list}" ] + then + umount "${backing}" + rmdir "${backing}" + continue + fi + + [ "${DEBUG}" = "Yes" ] && cp ${include_list} ${persistent_backing}/${persistence_list}.${device_name} + while read source dest options # < ${include_list} + do + if echo ${source} | grep -qe "^[[:space:]]*#" + then + # skipping commented line + continue + fi + + if echo ${dest} | grep -qe "^[^/]" + then + options="${dest}" + dest="${source}" + elif [ -z "${dest}" ] + then + dest="${source}" + fi + + if echo ${dest} | grep -qe "^/\+$\|^/\+live\(/.*\)\?$" + then + # mounting on / or /live could cause trouble + log_warning_msg "Skipping unsafe custom mount on ${dest}" + continue + fi + + for opt in $(echo ${options} | tr ',' ' '); + do + case "${opt}" in + "linkfiles") + ;; + *) + log_warning_msg "Skipping custom mount with unkown option: ${opt}" + continue + ;; + esac + done + + # FIXME: handle case: we already have /a/b in $bindings added from current $device, but now we find /a -- /a should replace /a/b in $bindings. + # FIXME: handle case: we have /a in $bindings from current $device, now we find /a/b, so we skip /a/b + + # ensure that no multiple-/ occur in paths + full_source="$(echo ${backing}/${source}/ | sed -e 's|/\+|/|g')" + full_dest="$(echo ${rootmnt}/${dest}/ | sed -e 's|/\+|/|g')" + device_used="yes" + if echo ${options} | grep -qe "\"; + then + echo "${full_source} ${full_dest} ${options}" >> ${links} + else + echo "${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 -f ${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 -f ${links} + + [ "${DEBUG}" = "Yes" ] && cp ${custom_mounts} ${persistent_backing} + + # Now we do the actual mounting (and symlinking) + while read source dest options # < ${custom_mounts} + do + if mountpoint -q "${dest}"; + then + log_warning_msg "Skipping custom mount ${source} on ${dest}: destination is already a mount point" + 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 echo ${dest} | grep -qe "^${rootmnt}/*home/\+[^/]\+" + then + path="/" + for dir in $(echo ${dest} | sed -e 's|/\+| |g') + do + path=${path}/${dir} + if [ ! -e ${path} ] + then + mkdir -p ${path} + # assume that the intended user is the first, which is usually the case + chown 1000:1000 ${path} + fi + done + else + mkdir -p ${dest} + fi + fi + + # FIXME: could we instead only save the aufs-diff in the persistent media? implications? What about when there's changes in the live image? + + # if ${source} doesn't exist on our persistent 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}" ] || echo ${options} | grep -qe "\" + then + continue + fi + # ensure that $dest is not copied *into* $source + mkdir -p "$(dirname ${source})" + cp -a "${dest}" "${source}" + fi + + if [ -z "${PERSISTENT_READONLY}" ] + then + if echo ${options} | grep -qe "\"; + then + links_source="${source}" + links_dest="${dest}" + else + mount --bind "${source}" "${dest}" + fi + else + if echo ${options} | grep -qe "\"; + then + links_dest="${dest}" + dest="$(mktemp -d ${persistent_backing}/links_source-XXXXXX)" + links_source="${dest}" + fi + unionrw="$(echo ${dest} | sed -e "s|${rootmnt}|/cow/|")" + mkdir -p ${unionrw} + unionmountopts="noatime,${noxino_opt}dirs=${unionrw}=rw:${source}=${roopt}" + mount -t "${UNIONTYPE}" -o "${unionmountopts}" "${UNIONTYPE}" "${dest}" + fi + + if echo $options | grep -qe "\"; + then + link_files "${links_source}" "${links_dest}" "${rootmnt}" + fi + + PERSISTENCE_IS_ON="1" + export PERSISTENCE_IS_ON + done < ${custom_mounts} + rm -f ${bindings} # Look for other snapshots to copy in try_snap "${root_snapdata}" "${rootmnt}" "ROOT"