# Load custom keymap
if [ -x /bin/loadkeys -a -r /etc/boottime.kmap.gz ]
then
- loadkeys /etc/boottime.kmap.gz
+ loadkeys --quiet /etc/boottime.kmap.gz
fi
}
device=${1}
probe=${2}
- backing="${rootmnt}/lib/live/mount/persistence/$(basename ${device})"
+ backing="/live/persistence/$(basename ${device})"
mkdir -p "${backing}"
old_backing="$(where_is_mounted ${device})"
white_listed_devices="${2}"
ret=""
- black_listed_devices="$(what_is_mounted_on ${rootmnt}/lib/live/medium)"
+ black_listed_devices="$(what_is_mounted_on /live/medium)"
for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
do
# is non-empty, remove mask from all source paths when
# creating links (will be necessary if we change root, which
# live-boot normally does (into $rootmnt)).
- local src_dir dest_dir src_mask
+ local src_dir dest_dir src_transform
# remove multiple /:s and ensure ending on /
src_dir="$(trim_path ${1})/"
dest_dir="$(trim_path ${2})/"
- src_mask="${3}"
+ src_transform="${3}"
# This check can only trigger on the inital, non-recursive call since
# we create the destination before recursive calls
chown_ref "${src}" "${dest}"
chmod_ref "${src}" "${dest}"
fi
- link_files "${src}" "${dest}" "${src_mask}"
+ link_files "${src}" "${dest}" "${src_transform}"
else
final_src=${src}
- if [ -n "${src_mask}" ]
+ if [ -n "${src_transform}" ]
then
- final_src="$(echo ${final_src} | sed "s|^${src_mask}||")"
+ final_src="$(echo ${final_src} | sed "${src_transform}")"
fi
rm -rf "${dest}" 2> /dev/null
ln -s "${final_src}" "${dest}"
get_custom_mounts ()
{
- # Side-effect: leaves $devices with persistence.conf mounted in ${rootmnt}/lib/live/mount/persistence
+ # Side-effect: leaves $devices with persistence.conf mounted in /live/persistence
# Side-effect: prints info to file $custom_mounts
local custom_mounts devices bindings links
if [ -n "${DEBUG}" ] && [ -e "${include_list}" ]
then
- cp ${include_list} ${rootmnt}/lib/live/mount/persistence/${persistence_list}.${device_name}
+ cp ${include_list} /live/persistence/${persistence_list}.${device_name}
fi
while read dir options # < ${include_list}
# ignore the loop below and set rootfs_dest_backing=$dest
local rootfs_dest_backing
rootfs_dest_backing=""
- if [ -n "${opt_link}"]
+ if [ -n "${opt_link}" ] || [ -n "${opt_union}" ]
then
- for d in ${rootmnt}/lib/live/mount/rootfs/*
+ for d in /live/rootfs/*
do
if [ -n "${rootmnt}" ]
then
local cow_dir links_source
if [ -n "${opt_link}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
- link_files ${source} ${dest} ${rootmnt}
+ link_files ${source} ${dest} "s|^/live/|/lib/live/mount/|"
elif [ -n "${opt_link}" ] && [ -n "${PERSISTENCE_READONLY}" ]
then
mkdir -p ${rootmnt}/lib/live/mount/persistence
# has its own directory and isn't nested with some
# other custom mount (if so that mount's files would
# be linked, causing breakage.
- cow_dir="${rootmnt}/lib/live/mount/overlay/lib/live/mount/persistence/$(basename ${links_source})"
+ cow_dir="/live/overlay/lib/live/mount/persistence/$(basename ${links_source})"
mkdir -p ${cow_dir}
chown_ref "${source}" "${cow_dir}"
chmod_ref "${source}" "${cow_dir}"
do_union ${links_source} ${cow_dir} ${source} ${rootfs_dest_backing}
- link_files ${links_source} ${dest} ${rootmnt}
+ link_files ${links_source} ${dest} "s|^${rootmnt}||"
elif [ -n "${opt_union}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
do_union ${dest} ${source} ${rootfs_dest_backing}
# bind-mount and union mount are handled the same
# in read-only mode, but note that rootfs_dest_backing
# is non-empty (and necessary) only for unions
- cow_dir="${rootmnt}/lib/live/mount/overlay/${dest}"
+ cow_dir="/live/overlay/${dest}"
if [ -e "${cow_dir}" ] && [ -z "${opt_link}" ]
then
# If an earlier custom mount has files here