summaryrefslogtreecommitdiff
path: root/scripts/live-helpers
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/live-helpers')
-rw-r--r--scripts/live-helpers164
1 files changed, 82 insertions, 82 deletions
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 9fea5a6..40058e9 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -89,9 +89,9 @@ Arguments ()
export FETCH
;;
- forcepersistentfsck)
- FORCEPERSISTENTFSCK="Yes"
- export FORCEPERSISTENTFSCK
+ forcepersistencefsck)
+ FORCEPERSISTENCEFSCK="Yes"
+ export FORCEPERSISTENCEFSCK
;;
ftpfs=*)
@@ -222,52 +222,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 +381,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 "\<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
}
@@ -737,7 +737,7 @@ try_mount ()
fi
}
-mount_persistent_media ()
+mount_persistence_media ()
{
local device=${1}
local backing=""
@@ -748,7 +748,7 @@ mount_persistent_media ()
then
backing="/$(basename ${device})-backing"
else
- backing="${rootmnt}/live/persistent/$(basename ${device})"
+ backing="${rootmnt}/live/persistence/$(basename ${device})"
fi
mkdir -p "${backing}"
@@ -757,7 +757,7 @@ mount_persistent_media ()
then
local fstype="$(get_fstype ${device})"
local mount_opts="rw,noatime"
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
mount_opts="ro,noatime"
fi
@@ -766,7 +766,7 @@ mount_persistent_media ()
echo ${backing}
return 0
else
- log_warning_msg "Failed to mount persistent media ${device}"
+ log_warning_msg "Failed to mount persistence media ${device}"
return 1
fi
elif [ "${backing}" != "${old_backing}" ]
@@ -776,14 +776,14 @@ mount_persistent_media ()
echo ${backing}
return 0
else
- log_warning_msg "Failed to move persistent media ${device}"
+ log_warning_msg "Failed to move persistence media ${device}"
return 1
fi
fi
return 0
}
-close_persistent_media () {
+close_persistence_media () {
local device=${1}
local backing="$(where_is_mounted ${device})"
@@ -804,7 +804,7 @@ open_luks_device ()
dev="${1}"
name="$(basename ${dev})"
opts="--key-file=-"
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
opts="${opts} --readonly"
fi
@@ -912,7 +912,7 @@ probe_for_file_name ()
local dev="${3}"
local ret=""
- local backing="$(mount_persistent_media ${dev})"
+ local backing="$(mount_persistence_media ${dev})"
if [ -z "${backing}" ]
then
return
@@ -920,7 +920,7 @@ probe_for_file_name ()
for label in ${overlays}
do
- path=${backing}/${PERSISTENT_PATH}${label}
+ path=${backing}/${PERSISTENCE_PATH}${label}
if [ -f "${path}" ]
then
local loopdev=$(setup_loop "${path}" "loop" "/sys/block/loop*")
@@ -931,7 +931,7 @@ probe_for_file_name ()
do
for ext in squashfs cpio.gz ext2 ext3 ext4 jffs2
do
- path="${PERSISTENT_PATH}${label}.${ext}"
+ path="${PERSISTENCE_PATH}${label}.${ext}"
if [ -f "${backing}/${path}" ]
then
ret="${ret} ${label}=${dev}:${backing}:${path}"
@@ -947,7 +947,7 @@ probe_for_file_name ()
fi
}
-find_persistent_media ()
+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
@@ -955,7 +955,7 @@ find_persistent_media ()
# 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
@@ -984,7 +984,7 @@ find_persistent_media ()
# 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 ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>" && \
+ if echo ${PERSISTENCE_ENCRYPTION} | grep -qe "\<luks\>" && \
is_luks_partition ${dev}
then
if luks_device=$(open_luks_device "${dev}")
@@ -994,14 +994,14 @@ find_persistent_media ()
# 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
# Probe for matching GPT partition names or filesystem labels
- if echo ${PERSISTENT_STORAGE} | grep -qe "\<filesystem\>"
+ if echo ${PERSISTENCE_STORAGE} | grep -qe "\<filesystem\>"
then
result=$(probe_for_gpt_name "${overlays}" "${snapshots}" ${dev})
if [ -n "${result}" ]
@@ -1019,7 +1019,7 @@ find_persistent_media ()
fi
# Probe for files with matching name on mounted partition
- if echo ${PERSISTENT_STORAGE} | grep -qe "\<file\>"
+ if echo ${PERSISTENCE_STORAGE} | grep -qe "\<file\>"
then
result=$(probe_for_file_name "${overlays}" "${snapshots}" ${dev})
if [ -n "${result}" ]
@@ -1261,7 +1261,7 @@ do_union ()
get_custom_mounts ()
{
- # Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistent
+ # Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistence
# Side-effect: prints info to file $custom_mounts
local custom_mounts=${1}
@@ -1280,7 +1280,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
@@ -1294,7 +1294,7 @@ 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 dir options # < ${include_list}
@@ -1374,7 +1374,7 @@ get_custom_mounts ()
do
if echo ${source} | grep -qe "^${prev_source}\(/.*\)\?$"
then
- panic "Two persistent mounts have the same or nested sources: ${source} on ${dest}, and ${prev_source} on ${prev_dest}"
+ 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}
@@ -1440,13 +1440,13 @@ activate_custom_mounts ()
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}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
continue
elif [ -n "${opt_union}" ] || [ -n "${opt_linkfiles}" ]
@@ -1486,13 +1486,13 @@ activate_custom_mounts ()
done
fi
- if [ -n "${opt_linkfiles}" ] && [ -z "${PERSISTENT_READONLY}" ]
+ if [ -n "${opt_linkfiles}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
link_files ${source} ${dest} ${rootmnt}
- elif [ -n "${opt_linkfiles}" ] && [ -n "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_linkfiles}" ] && [ -n "${PERSISTENCE_READONLY}" ]
then
- mkdir -p ${rootmnt}/live/persistent
- local links_source=$(mktemp -d ${rootmnt}/live/persistent/links-source-XXXXXX)
+ 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
@@ -1502,24 +1502,24 @@ activate_custom_mounts ()
# be linked, causing breakage.
if [ -n "${rootmnt}" ]
then
- local cow_dir="/overlay/live/persistent/$(basename ${links_source})"
+ local cow_dir="/overlay/live/persistence/$(basename ${links_source})"
else
# This is happens if persistence is activated
# post boot
- local cow_dir="/live/overlay/live/persistent/$(basename ${links_source})"
+ local cow_dir="/live/overlay/live/persistence/$(basename ${links_source})"
fi
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 "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_union}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
do_union ${dest} ${source} ${rofs_dest_backing}
- elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
mount --bind "${source}" "${dest}"
- elif [ -n "${opt_bind}" -o -n "${opt_union}" ] && [ -n "${PERSISTENT_READONLY}" ]
+ 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
@@ -1561,12 +1561,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
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-30 16:11:39 +0000