udevinfo='udevinfo'
fi
+root_overlay_label="full-ov"
+old_root_overlay_label="live-rw"
+old_home_overlay_label="home-rw"
+custom_overlay_label="custom-ov"
+root_snapshot_label="live-sn"
+old_root_snapshot_label="live-sn"
+home_snapshot_label="home-sn"
+persistence_list="live-persistence.conf"
+
Arguments ()
{
PRESEEDS=""
export FETCH
;;
- forcepersistentfsck)
- FORCEPERSISTENTFSCK="Yes"
- export FORCEPERSISTENTFSCK
+ forcepersistencefsck)
+ FORCEPERSISTENCEFSCK="Yes"
+ export FORCEPERSISTENCEFSCK
;;
ftpfs=*)
export STATICIP
;;
+ findiso=*)
+ FINDISO="${ARGUMENT#findiso=}"
+ export FINDISO
+ ;;
+
live-getty)
LIVE_GETTY="1"
export LIVE_GETTY
export NFSOPTS
;;
- nfscow=*)
- NFS_COW="${ARGUMENT#nfscow=}"
+ nfsoverlay=*)
+ NFS_COW="${ARGUMENT#nfsoverlay=}"
export NFS_COW
;;
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=}"
- 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=}"
+ 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)
export UNIONTYPE
fi
- if [ -z "${PERSISTENT_ENCRYPTION}" ]
+ if [ -z "${PERSISTENCE_ENCRYPTION}" ]
then
- PERSISTENT_ENCRYPTION="none"
- export PERSISTENT_ENCRYPTION
- elif echo ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>"
+ PERSISTENCE_ENCRYPTION="none"
+ export PERSISTENCE_ENCRYPTION
+ elif echo ${PERSISTENCE_ENCRYPTION} | grep -qe "\<luks\>"
then
if ! modprobe dm-crypt
then
log_warning_msg "Unable to load module dm-crypt"
- PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
- export PERSISTENT_ENCRYPTION
+ PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
+ export PERSISTENCE_ENCRYPTION
fi
if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
then
log_warning_msg "cryptsetup in unavailable"
- PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
- export PERSISTENT_ENCRYPTION
+ PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
+ export PERSISTENCE_ENCRYPTION
fi
fi
- if [ -z "${PERSISTENT_METHOD}" ]
+ if [ -z "${PERSISTENCE_METHOD}" ]
then
- PERSISTENT_METHOD="snapshot,overlay"
- export PERSISTENT_METHOD
+ PERSISTENCE_METHOD="snapshot,overlay"
+ export PERSISTENCE_METHOD
fi
- if [ -z "${PERSISTENT_STORAGE}" ]
+ if [ -z "${PERSISTENCE_STORAGE}" ]
then
- PERSISTENT_STORAGE="filesystem,file"
- export PERSISTENT_STORAGE
+ PERSISTENCE_STORAGE="filesystem,file"
+ export PERSISTENCE_STORAGE
fi
}
where_is_mounted ()
{
device=${1}
+ # return first found
+ grep -m1 "^${device} " /proc/mounts | cut -f2 -d ' '
+}
- if grep -q "^${device} " /proc/mounts
- then
- # return the first found
- grep -m1 "^${device} " /proc/mounts | cut -f2 -d ' '
- fi
+trim_path () {
+ # 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 ()
+{
+ local dir="$(trim_path ${1})"
+ 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 ()
fi
}
+mount_persistence_media ()
+{
+ local device=${1}
+ local backing=""
+
+ # We can't mount into ${rootmnt}/live before ${rootmnt} has been
+ # mounted since that would cover our mountpoint.
+ if [ -n "${rootmnt}" ] && [ -z "$(what_is_mounted_on ${rootmnt})" ]
+ then
+ backing="/$(basename ${device})-backing"
+ else
+ backing="${rootmnt}/live/persistence/$(basename ${device})"
+ fi
+
+ mkdir -p "${backing}"
+ local old_backing="$(where_is_mounted ${device})"
+ if [ -z "${old_backing}" ]
+ then
+ local fstype="$(get_fstype ${device})"
+ local mount_opts="rw,noatime"
+ if [ -n "${PERSISTENCE_READONLY}" ]
+ then
+ mount_opts="ro,noatime"
+ fi
+ if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null
+ then
+ echo ${backing}
+ return 0
+ else
+ log_warning_msg "Failed to mount persistence media ${device}"
+ return 1
+ fi
+ elif [ "${backing}" != "${old_backing}" ]
+ then
+ if mount --move ${old_backing} ${backing} >/dev/null
+ then
+ echo ${backing}
+ return 0
+ else
+ log_warning_msg "Failed to move persistence media ${device}"
+ return 1
+ fi
+ fi
+ return 0
+}
+
+close_persistence_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}"
name="$(basename ${dev})"
opts="--key-file=-"
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
opts="${opts} --readonly"
fi
+ if /sbin/cryptsetup status "${name}" >/dev/null 2>&1
+ then
+ re="^[[:space:]]*device:[[:space:]]*\([^[:space:]]*\)$"
+ opened_dev=$(cryptsetup status ${name} 2>/dev/null | grep "${re}" | sed "s|${re}|\1|")
+ if [ "${opened_dev}" = "${dev}" ]
+ then
+ luks_device="/dev/mapper/${name}"
+ echo ${luks_device}
+ return 0
+ else
+ log_warning_msg "Cannot open luks device ${dev} since ${opened_dev} already is opened with its name"
+ return 1
+ fi
+ fi
+
load_keymap
while true
done
}
-find_persistent_media ()
+get_gpt_name ()
+{
+ local dev="${1}"
+ /sbin/blkid -s PART_ENTRY_NAME -p -o value ${dev} 2>/dev/null
+}
+
+is_gpt_device ()
+{
+ local dev="${1}"
+ [ "$(/sbin/blkid -s PART_ENTRY_SCHEME -p -o value ${dev} 2>/dev/null)" = "gpt" ]
+}
+
+probe_for_gpt_name ()
+{
+ local overlays="${1}"
+ local snapshots="${2}"
+ local dev="${3}"
+
+ local gpt_dev="${dev}"
+ if is_active_luks_mapping ${dev}
+ then
+ # if $dev is an opened luks device, we need to check
+ # GPT stuff on the backing device
+ gpt_dev=$(get_luks_backing_device "${dev}")
+ fi
+
+ if ! is_gpt_device ${gpt_dev}
+ then
+ return
+ fi
+
+ local gpt_name=$(get_gpt_name ${gpt_dev})
+ for label in ${overlays} ${snapshots}
+ do
+ if [ "${gpt_name}" = "${label}" ]
+ then
+ echo "${label}=${dev}"
+ fi
+ done
+}
+
+probe_for_fs_label ()
+{
+ local overlays="${1}"
+ local snapshots="${2}"
+ local dev="${3}"
+
+ for label in ${overlays} ${snapshots}
+ do
+ if [ "$(/sbin/blkid -s LABEL -o value $dev 2>/dev/null)" = "${label}" ]
+ then
+ echo "${label}=${dev}"
+ fi
+ done
+}
+
+probe_for_file_name ()
+{
+ local overlays="${1}"
+ local snapshots="${2}"
+ local dev="${3}"
+
+ local ret=""
+ local backing="$(mount_persistence_media ${dev})"
+ if [ -z "${backing}" ]
+ then
+ return
+ fi
+
+ for label in ${overlays}
+ do
+ path=${backing}/${PERSISTENCE_PATH}${label}
+ if [ -f "${path}" ]
+ then
+ local loopdev=$(setup_loop "${path}" "loop" "/sys/block/loop*")
+ ret="${ret} ${label}=${loopdev}"
+ fi
+ done
+ for label in ${snapshots}
+ do
+ for ext in squashfs cpio.gz ext2 ext3 ext4 jffs2
+ do
+ path="${PERSISTENCE_PATH}${label}.${ext}"
+ if [ -f "${backing}/${path}" ]
+ then
+ ret="${ret} ${label}=${dev}:${backing}:${path}"
+ fi
+ done
+ done
+
+ if [ -n "${ret}" ]
+ then
+ echo ${ret}
+ else
+ umount ${backing} > /dev/null 2>&1 || true
+ fi
+}
+
+find_persistence_media ()
{
# Scans devices for overlays and snapshots, and returns a whitespace
# separated list of how to use them. Only overlays with a partition
# snapshots with labels in ${snapshots}.
#
# When scanning a LUKS device, the user will be asked to enter the
- # passphrase; on failure to enter it, or if no persistent partitions
+ # passphrase; on failure to enter it, or if no persistence partitions
# or files were found, the LUKS device is closed.
#
# For a snapshot file the return value is ${label}=${snapdata}", where
# ${white_list_devices} is non-empty, only devices in it will be
# scanned.
- overlays="${1}"
- snapshots="${2}"
- black_listed_devices="${3}"
- white_listed_devices="${4}"
- persistent_backing="${rootmnt}/live/persistent"
+ local overlays="${1}"
+ local snapshots="${2}"
+ local white_listed_devices="${3}"
+ local ret=""
- for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
+ for dev in $(storage_devices "" "${white_listed_devices}")
do
- luks_device=""
-
- # Checking for a luks device
- if echo ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>" && \
- /sbin/cryptsetup isLuks ${dev}
+ local result=""
+
+ 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. activate_custom_mounts() also depends on that any luks
+ # device already has been opened.
+ if echo ${PERSISTENCE_ENCRYPTION} | grep -qe "\<luks\>" && \
+ is_luks_partition ${dev}
then
if luks_device=$(open_luks_device "${dev}")
then
# skip $dev since we failed/chose not to open it
continue
fi
- elif echo ${PERSISTENT_ENCRYPTION} | grep -qve "\<none\>"
+ elif echo ${PERSISTENCE_ENCRYPTION} | grep -qve "\<none\>"
then
# skip $dev since we don't allow unencrypted storage
continue
fi
- if echo ${PERSISTENT_STORAGE} | grep -qe "\<filesystem\>"
- then
- for label in ${overlays} ${snapshots}
- do
- if [ "$(/sbin/blkid -s LABEL -o value $dev 2>/dev/null)" = "${label}" ]
- then
- echo "${label}=${dev}"
- # skip to the next device
- continue 2
- fi
- done
- fi
-
- overlay_on_dev=""
- snapshot_on_dev=""
- if echo ${PERSISTENT_STORAGE} | grep -qe "\<file\>"
+ # Probe for matching GPT partition names or filesystem labels
+ if echo ${PERSISTENCE_STORAGE} | grep -qe "\<filesystem\>"
then
- devfstype="$(get_fstype ${dev})"
- backing="${persistent_backing}/$(basename ${dev})"
- mkdir -p "${backing}"
- if is_supported_fs ${devfstype} && try_mount "${dev}" "${backing}" "rw" "${devfstype}"
+ result=$(probe_for_gpt_name "${overlays}" "${snapshots}" ${dev})
+ if [ -n "${result}" ]
then
- for label in ${overlays}
- do
- path=${backing}/${PERSISTENT_PATH}${label}
- if [ -f "${path}" ]
- then
- overlay_on_dev="yes"
- echo "${label}=$(setup_loop "${path}" "loop" "/sys/block/loop*")"
- fi
- done
+ ret="${ret} ${result}"
+ continue
+ fi
- for label in ${snapshots}
- do
- for ext in squashfs cpio.gz ext2 ext3 ext4 jffs2
- do
- path="${PERSISTENT_PATH}${label}.${ext}"
- if [ -f "${backing}/${path}" ]
- then
- snapshot_on_dev="yes"
- echo "${label}=${dev}:${backing}:${path}"
- fi
- done
- done
+ result=$(probe_for_fs_label "${overlays}" "${snapshots}" ${dev})
+ if [ -n "${result}" ]
+ then
+ ret="${ret} ${result}"
+ continue
fi
- if [ -z "${overlay_on_dev}" ] && [ -z "${snapshot_on_dev}" ]
+ fi
+
+ # Probe for files with matching name on mounted partition
+ if echo ${PERSISTENCE_STORAGE} | grep -qe "\<file\>"
+ then
+ result=$(probe_for_file_name "${overlays}" "${snapshots}" ${dev})
+ if [ -n "${result}" ]
then
- umount ${backing} > /dev/null 2>&1 || true
+ ret="${ret} ${result}"
+ continue
fi
fi
- if [ -z "${overlay_on_dev}" ] && [ -z "${snapshot_on_dev}" ] && \
- [ -n "${luks_device}" ] && \
- /sbin/cryptsetup status "${luks_device}" 1> /dev/null 2>&1
+
+ # Close luks device if it isn't used
+ if [ -z "${result}" ] && [ -n "${luks_device}" ] && \
+ is_active_luks_mapping "${luks_device}"
then
/sbin/cryptsetup luksClose "${luks_device}"
fi
done
+
+ if [ -n "${ret}" ]
+ then
+ echo ${ret}
+ fi
}
get_mac ()
echo ${mac}
}
-is_luks()
+is_luks_partition ()
{
- devname="${1}"
- if [ -x /sbin/cryptsetup ]
- then
- /sbin/cryptsetup isLuks "${devname}" 2>/dev/null || ret=${?}
- return ${ret}
- else
- return 1
- fi
+ device="${1}"
+ /sbin/cryptsetup isLuks "${device}" 1>/dev/null 2>&1
+}
+is_active_luks_mapping ()
+{
+ device="${1}"
+ /sbin/cryptsetup status "${device}" 1>/dev/null 2>&1
+}
+
+get_luks_backing_device () {
+ device=${1}
+ cryptsetup status ${device} 2> /dev/null | \
+ awk '{if ($1 == "device:") print $2}'
}
removable_dev ()
# 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
# we create the destination before recursive calls
- if [ ! -d "${dest_dir}" ];
+ if [ ! -d "${dest_dir}" ]
then
log_warning_msg "Must link_files into a directory"
return
fi
- find "${src_dir}" -mindepth 1 -maxdepth 1 | while read x; do
- local src="${x}"
- local dest="${dest_dir}$(basename "${x}")"
- if [ -d "${src}" ];
+ find "${src_dir}" -mindepth 1 -maxdepth 1 | while read src; do
+ local dest="${dest_dir}$(basename "${src}")"
+ if [ -d "${src}" ]
then
- if [ -z "$(ls -A "${src}")" ];
+ if [ -z "$(ls -A "${src}")" ]
then
continue
fi
- if [ ! -d "${dest}" ];
+ if [ ! -d "${dest}" ]
then
mkdir -p "${dest}"
- prev="$(dirname "${dest}")"
- chown $(stat -c %u:%g "${prev}") "${dest}"
- chmod $(stat -c %a "${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
}
-do_union () {
+do_union ()
+{
local unionmountpoint="${1}" # directory where the union is mounted
local unionrw="${2}" # branch where the union changes are stored
local unionro1="${3}" # first underlying read-only branch (optional)
esac
}
-get_custom_mounts () {
- # Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistent
+get_custom_mounts ()
+{
+ # Side-effect: leaves $devices with live-persistence.conf mounted in ${rootmnt}/live/persistence
# Side-effect: prints info to file $custom_mounts
- local devices="${1}"
- local custom_mounts="${2}" # print result to this file
- local rootmnt="${3}" # should be set empty post-live-boot
+ local custom_mounts=${1}
+ shift
+ local devices=${@}
- local bindings="/bindings.list"
- local links="/links.list"
+ local bindings="/tmp/bindings.list"
+ local links="/tmp/links.list"
rm -rf ${bindings} ${links} 2> /dev/null
- local persistent_backing="${rootmnt}/live/persistent"
for device in ${devices}
do
then
continue
fi
+
local device_name="$(basename ${device})"
- local backing="${persistent_backing}/${device_name}"
- mkdir -p "${backing}"
- local device_fstype="$(get_fstype ${device})"
- if [ -z "${PERSISTENT_READONLY}" ]
+ local backing=$(mount_persistence_media ${device})
+ if [ -z "${backing}" ]
then
- device_mount_opts="rw,noatime"
- else
- device_mount_opts="ro,noatime"
+ continue
fi
- local device_used=""
- mount -t "${device_fstype}" -o "${device_mount_opts}" "${device}" "${backing}"
+
local 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}
+ if [ -n "${DEBUG}" ] && [ -e "${include_list}" ]
+ then
+ cp ${include_list} ${rootmnt}/live/persistence/${persistence_list}.${device_name}
+ fi
+
+ 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}" ]
+ if trim_path ${dir} | grep -q -e "^[^/]" -e "^/$" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
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}"
+ 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}"
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
+ 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
- # ensure that no multiple-/ occur in paths
- local full_source="$(echo ${backing}/${source}/ | sed -e 's|/\+|/|g')"
- local full_dest="$(echo ${rootmnt}/${dest}/ | sed -e 's|/\+|/|g')"
- device_used="yes"
- if echo ${options} | grep -qe "\<linkfiles\>";
+ local full_source="$(trim_path ${backing}/${source})"
+ 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}
-
- rm -f ${bindings} ${links} 2> /dev/null
- echo ${custom_mounts}
+ [ -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
}
-do_custom_mounts () {
+activate_custom_mounts ()
+{
local custom_mounts="${1}" # the ouput from get_custom_mounts()
- local rootmnt="${2}" # should be set empty post-live-boot
+ local used_devices=""
- while read source dest options # < ${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 mountpoint -q "${dest}";
+ if [ -n "$(what_is_mounted_on "${dest}")" ]
then
- log_warning_msg "Skipping custom mount ${source} on ${dest}: destination is already a mount point"
+ 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 echo ${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
- if [ -n "${rootmnt}" ]
- then
- rofs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")"
- else
- rofs_dest_backing="${d}/${dest}"
+ # 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
- fi
- if [ -d "${rofs_dest_backing}" ]
+ 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
- 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_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
+
+ if echo ${used_devices} | grep -qve "^\(.* \)\?${device}\( .*\)\?$"
+ then
+ used_devices="${used_devices} ${device}"
+ fi
done < ${custom_mounts}
+
+ echo ${used_devices}
+}
+
+fix_home_rw_compatibility ()
+{
+ local device=${1}
+
+ if [ -n "${PERSISTENCE_READONLY}" ]
+ then
+ return
+ fi
+
+ local backing="$(mount_persistence_media ${device})"
+ if [ -z "${backing}" ]
+ then
+ return
+ fi
+
+ local include_list="${backing}/${persistence_list}"
+ if [ ! -r "${include_list}" ]
+ then
+ echo "# home-rw backwards compatibility:
+/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
}
projects / live-boot-grml.git / blobdiff