if [ -f ${mountpoint}/${FINDISO} ]
then
umount ${mountpoint}
- mkdir -p /live/findiso
- mount -t ${fstype} -o ro,noatime "${devname}" /live/findiso
- loopdevname=$(setup_loop "/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" 0 "")
+ mkdir -p /run/live/findiso
+ mount -t ${fstype} -o ro,noatime "${devname}" /run/live/findiso
+ loopdevname=$(setup_loop "/run/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" 0 "")
devname="${loopdevname}"
mount -t iso9660 -o ro,noatime "${devname}" ${mountpoint}
else
return 1
fi
+ # get_fstype might report "unknown" or "swap", ignore it as no such kernel module exists
+ if [ "${fstype}" = "unknown" ] || [ "${fstype}" = "swap" ]
+ then
+ return 1
+ fi
+
# Try to look if it is already supported by the kernel
if grep -q ${fstype} /proc/filesystems
then
get_fstype ()
{
- /sbin/blkid -s TYPE -o value $1 2>/dev/null
+ blkid -s TYPE -o value $1 2>/dev/null
}
where_is_mounted ()
{
testpath="${1}"
mounts="$(awk '{print $2}' /proc/mounts)"
- testpath="$(busybox realpath ${testpath})"
+ testpath="$(realpath ${testpath})"
while true
do
echo "${passphrase}" > /tmp/passphrase
unset passphrase
exec 9</tmp/passphrase
- /sbin/losetup ${options} -e "${encryption}" -p 9 "${dev}" "${fspath}"
+ losetup ${options} -e "${encryption}" -p 9 "${dev}" "${fspath}"
error=${?}
exec 9<&-
rm -f /tmp/passphrase
# get_custom_mounts() might call this with a directory path instead
# of a block device path. This means we have found sub-directory path
- # underneath /lib/live/mounts/persistence, so we're done
+ # underneath /run/live/persistence, so we're done
if [ -d "${device}" ]
then
echo "${device}"
return 1
fi
- backing="/live/persistence/$(basename ${device})"
+ backing="/run/live/persistence/$(basename ${device})"
mkdir -p "${backing}"
old_backing="$(where_is_mounted ${device})"
fi
elif [ "${backing}" != "${old_backing}" ]
then
- if ! mount --move ${old_backing} ${backing} >/dev/null
+ if ! mount -o move ${old_backing} ${backing} >/dev/null
then
[ -z "${probe}" ] && log_warning_msg "Failed to move persistence media ${device}"
rmdir "${backing}"
if is_active_luks_mapping ${device}
then
- /sbin/cryptsetup luksClose ${device}
+ cryptsetup luksClose ${device}
fi
}
opts="${opts} --readonly"
fi
- if /sbin/cryptsetup status "${name}" >/dev/null 2>&1
+ if 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|")
while true
do
$cryptkeyscript "$cryptkeyprompt" | \
- /sbin/cryptsetup -T 1 luksOpen ${dev} ${name} ${opts}
+ cryptsetup -T 1 luksOpen ${dev} ${name} ${opts}
if [ 0 -eq ${?} ]
then
{
local dev
dev="${1}"
- /sbin/blkid -s PART_ENTRY_NAME -p -o value ${dev} 2>/dev/null
+ blkid -s PART_ENTRY_NAME -p -o value ${dev} 2>/dev/null
}
is_gpt_device ()
{
local dev
dev="${1}"
- [ "$(/sbin/blkid -s PART_ENTRY_SCHEME -p -o value ${dev} 2>/dev/null)" = "gpt" ]
+ [ "$(blkid -s PART_ENTRY_SCHEME -p -o value ${dev} 2>/dev/null)" = "gpt" ]
}
probe_for_gpt_name ()
for label in ${overlays}
do
- if [ "$(/sbin/blkid -s LABEL -o value $dev 2>/dev/null)" = "${label}" ]
+ if [ "$(blkid -s LABEL -o value $dev 2>/dev/null)" = "${label}" ]
then
echo "${label}=${dev}"
fi
# 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}"
+ cryptsetup luksClose "${luks_device}"
fi
done
is_luks_partition ()
{
device="${1}"
- /sbin/cryptsetup isLuks "${device}" 1>/dev/null 2>&1
+ cryptsetup isLuks "${device}" 1>/dev/null 2>&1
}
is_active_luks_mapping ()
{
device="${1}"
- /sbin/cryptsetup status "${device}" 1>/dev/null 2>&1
+ cryptsetup status "${device}" 1>/dev/null 2>&1
}
get_luks_backing_device ()
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
do
+ if [ ! -d "${sysblock}" ]; then
+ continue
+ fi
+
dev_ok=
if [ "$(cat ${sysblock}/removable)" = "1" ]
then
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
do
+ if [ ! -d "${sysblock}" ]; then
+ continue
+ fi
+
if [ "$(cat ${sysblock}/removable)" = "0" ]
then
case "${output_format}" in
continue
fi
- if trim_path ${dir} | grep -q -e "^[^/]" -e "^/lib" -e "^/lib/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
+ if trim_path ${dir} | grep -q -e "^[^/]" -e "^/lib" -e "^/run/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
then
- log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/lib\", or \"/lib/live\" or any of its sub-directories."
+ log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/lib\", or \"/run/live\" or any of its sub-directories."
continue
fi
local cow_dir links_source
if [ -n "${opt_link}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
- link_files ${source} ${dest} "s|^/live/|/lib/live/mount/|"
+ link_files ${source} ${dest} ""
elif [ -n "${opt_link}" ] && [ -n "${PERSISTENCE_READONLY}" ]
then
- mkdir -p ${rootmnt}/lib/live/mount/persistence
- links_source=$(mktemp -d ${rootmnt}/lib/live/mount/persistence/links-source-XXXXXX)
+ mkdir -p /run/live/persistence
+ links_source=$(mktemp -d /run/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
# 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="/live/overlay/lib/live/mount/persistence/$(basename ${links_source})"
+ cow_dir="/run/live/overlay/run/live/persistence/$(basename ${links_source})"
mkdir -p ${cow_dir}
chown_ref "${source}" "${cow_dir}"
chmod_ref "${source}" "${cow_dir}"
do_union ${dest} ${source} ${rootfs_dest_backing}
elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
- mount --bind "${source}" "${dest}"
+ mount -o 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 rootfs_dest_backing
# is non-empty (and necessary) only for unions
- cow_dir="/live/overlay/${dest}"
+ cow_dir="/run/live/overlay/${dest}"
if [ -e "${cow_dir}" ] && [ -z "${opt_link}" ]
then
# If an earlier custom mount has files here
mkdir -p ${cow_dir}
chown_ref "${source}" "${cow_dir}"
chmod_ref "${source}" "${cow_dir}"
+ if [ "${UNIONTYPE}" = "overlay" ]
+ then
+ # When we use overlay we add the "/rw" postfix to our source when using it
+ # as upper layer. Therefore we also have to add it here when using it as
+ # the lower layer.
+ source="${source}/rw"
+ fi
do_union ${dest} ${cow_dir} ${source} ${rootfs_dest_backing}
fi