msw/CISS.debian.installer
SHA256
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V8.00.000.2025.06.17

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-06-25 23:33:15 +02:00
parent 429d84b67c
commit 78ffe421e5
2 changed files with 53 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
func/3240_partition_formatting.sh
View File

@@ -45,6 +45,18 @@ partition_formatting() {
var_fs_version=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.version" "${VAR_SETUP_PART}") var_fs_version=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.version" "${VAR_SETUP_PART}")
var_mount_path=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.path" "${VAR_SETUP_PART}") var_mount_path=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.path" "${VAR_SETUP_PART}")
if [[ "${var_encryption_enable,,}" == "true" && "${var_mount_path}" == "SWAP" ]]; then
mkfs.ext4 -L "${var_fs_label}" "/dev/${var_dev}${var_part}" 1M
do_log "info" "false" "Partition: '/dev/${var_dev}${var_part}' formatted: '${var_fs_version}'."
elif [[ "${var_encryption_enable,,}" == "true" && "${var_mount_path}" == "/tmp" ]]; then
mkfs.ext4 -L "${var_fs_label}" "/dev/${var_dev}${var_part}" 1M
do_log "info" "false" "Partition: '/dev/${var_dev}${var_part}' formatted: '${var_fs_version}'."
fi
### Formatting partition ### Formatting partition
if [[ "${var_encryption_enable,,}" == "true" && "${var_mount_path}" != "SWAP" && "${var_mount_path}" != "/tmp" ]]; then if [[ "${var_encryption_enable,,}" == "true" && "${var_mount_path}" != "SWAP" && "${var_mount_path}" != "/tmp" ]]; then

205
func/3280_mount_partition.sh
View File

@@ -76,31 +76,39 @@ mount_with_dir() {
# None # None
########################################################################################### ###########################################################################################
mount_partition() { mount_partition() {
### 3260_setup_filesystem.sh
### Assoziative Array (HashMap) to store Crypt Mapper OR Device for each Mount Path
### HMP_MOUNTPATH_DEV["${var_mount_path}"]="/dev/mapper/${var_encryption_label}"
### HMP_MOUNTPATH_DEV["${var_mount_path}"]="/dev/${var_dev}${var_part}"
### Mount "/"-filesystem ### Mount "/"-filesystem
declare -r var_mount_path_root="/" declare -r var_mount_path_root="/"
if [[ -n ${HMP_MOUNTPATH_DEV[$var_mount_path_root]} ]]; then if [[ -n ${HMP_MOUNTPATH_DEV[$var_mount_path_root]} ]]; then
mount_with_dir "${var_mount_path_root}" "${HMP_MOUNTPATH_DEV[$var_mount_path_root]}" mount_with_dir "${var_mount_path_root}" "${HMP_MOUNTPATH_DEV[$var_mount_path_root]}"
else else
do_log "error" "false" "Root-filesystem '${var_mount_path_root}' not found in Hashmap." do_log "error" "false" "Root-filesystem '${var_mount_path_root}' not found in Hashmap."
exit "${ERR_MOUNTING_ROOT}" exit "${ERR_MOUNTING_ROOT}"
fi fi
### Ensure order of "/boot" and "/boot/efi" ### Ensure order of "/boot" and "/boot/efi"
declare var_path declare var_path
for var_path in "/boot" "/boot/efi"; do for var_path in "/boot" "/boot/efi"; do
if [[ -n ${HMP_MOUNTPATH_DEV[${var_path}]} ]]; then if [[ -n ${HMP_MOUNTPATH_DEV[${var_path}]} ]]; then
mount_with_dir "${var_path}" "${HMP_MOUNTPATH_DEV[${var_path}]}" mount_with_dir "${var_path}" "${HMP_MOUNTPATH_DEV[${var_path}]}"
else else
do_log "info" "false" "Entry '${var_path}' not found in Hashmap." do_log "info" "false" "Entry '${var_path}' not found in Hashmap."
fi fi
done done
### Mounting all remaining keys of hashmap 'HMP_MOUNTPATH_DEV'. declare var_dev var_part var_fs_btrfs_compress var_fs_btrfs_level var_encryption_enable var_encryption_label \
var_fs_label var_fs_version var_mount_path var_mount_options var_mount_subvolume
### Iterate over all devices in the recipe. ### Iterate over all devices in the recipe.
for var_dev in $(yq e ".recipe.${VAR_RECIPE_STRING}.dev | keys | .[]" "${VAR_SETUP_PART}"); do for var_dev in $(yq e ".recipe.${VAR_RECIPE_STRING}.dev | keys | .[]" "${VAR_SETUP_PART}"); do
@@ -119,7 +127,7 @@ mount_partition() {
var_mount_options=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.options" "${VAR_SETUP_PART}") var_mount_options=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.options" "${VAR_SETUP_PART}")
var_mount_subvolume=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.subvolume" "${VAR_SETUP_PART}") var_mount_subvolume=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.subvolume" "${VAR_SETUP_PART}")
### Skip already mounted paths ("/", "/boot", "/boot/efi") and ("/recovery") ### Skip already mounted paths ("/", "/boot", "/boot/efi") and skip ("/recovery")
if [[ "${var_mount_path}" == "/" || "${var_mount_path}" == "/boot" || "${var_mount_path}" == "/boot/efi" || "${var_mount_path}" == "/recovery" ]]; then if [[ "${var_mount_path}" == "/" || "${var_mount_path}" == "/boot" || "${var_mount_path}" == "/boot/efi" || "${var_mount_path}" == "/recovery" ]]; then
continue continue
fi fi
@@ -133,189 +141,46 @@ mount_partition() {
swapon "/dev/mapper/${var_encryption_label}" swapon "/dev/mapper/${var_encryption_label}"
do_log "info" "false" "Mounted: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'." do_log "info" "false" "Mounted: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'."
elif [[ ${var_mount_path} == "/tmp" ]]; then elif [[ "${var_mount_path}" == "/tmp" ]]; then
cryptsetup open --type plain --key-file /dev/random \ cryptsetup open --type plain --key-file /dev/random \
--offset 2048 --cipher aes-xts-plain64 --key-size 512 \ --offset 2048 --cipher aes-xts-plain64 --key-size 512 \
--sector-size 4096 "/dev/disk/by-label/${var_fs_label}" "${var_encryption_label}" --sector-size 4096 "/dev/disk/by-label/${var_fs_label}" "${var_encryption_label}"
mkdir -p "${TARGET}/tmp" mkdir -p "${TARGET}/tmp"
mkfs.ext4 -L "${var_fs_label}" "/dev/mapper/${var_encryption_label}" "${var_fs_options:+ $var_fs_options}" mkfs.ext4 "/dev/mapper/${var_encryption_label}" "${var_fs_options:+ $var_fs_options}"
mount "${MOUNT_OPTIONS:+-o $MOUNT_OPTIONS}" "/dev/mapper/${var_encryption_label}" "${TARGET}/tmp" mount "${var_mount_options:+-o $var_mount_options}" "/dev/mapper/${var_encryption_label}" "${TARGET}/tmp"
do_log "info" "false" "Mounted: '${var_dev}' on: '/dev/mapper/${var_encryption_label}'." do_log "info" "false" "Mounted: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'."
else
done
done
declare var_key
declare var_transformed_string
declare var_device_path
declare var_encryption_label
declare var_matching_var
for var_key in "${!HMP_MOUNTPATH_DEV[@]}"; do
### Initialize variables.
var_device_path="${HMP_MOUNTPATH_DEV[${var_key}]}"
### If 'KEY:VALUE' equals "/dev/${DEV}${PARTITION}"
if [[ "${var_device_path}" =~ ^/dev/[a-zA-Z]+[0-9]+$ ]]; then
var_transformed_string=$(echo "${var_device_path}" | sed 's|/dev/|dev_|; s|\([a-zA-Z]\)\([0-9]\)|\1_\2|')
### If 'KEY:VALUE' equals "/dev/mapper/${ENCRYPTION_LABEL}"
elif [[ ${var_device_path} =~ ^/dev/mapper/ ]]; then
### Extract ENCRYPTION_LABEL
var_encryption_label="${var_device_path#/dev/mapper/}"
### Search matching variable of sourced "${PRESEED}" variable file
var_matching_var=$(declare -p | grep -oP "recipe_[^ ]+_encryption_label=${var_encryption_label}")
if [[ -n ${var_matching_var} ]]; then
### Extract third, fourth and fifth part of the respective variable
var_transformed_string=$(echo "${var_matching_var}" | sed -E 's|recipe_([^_]+_[^_]+_[^_]+)_.*|\1|')
else
do_log "error" "false" "No matching variable found for ENCRYPTION_LABEL='${var_encryption_label}'."
exit "${ERR_MOUNTING_LUKS}"
fi fi
else if [[ "${var_fs_version,,}" == "btrfs" && "${var_encryption_enable}" == "true" ]]; then
do_log "error" "false" "Unknown DEVICE_PATH-Format: '${var_device_path}'." declare var_btrfs_compression_options="compress=${var_fs_btrfs_compress}:${var_fs_btrfs_level}"
exit "${ERR_UNKNOWN_DEV}" mount_with_dir "${var_mount_path}" "/dev/mapper/${var_encryption_label}" "${var_btrfs_compression_options}"
[[ -n ${var_mount_subvolume} ]] && create_btrfs_subvolume "${var_mount_path}" "${var_mount_subvolume}"
do_log "info" "false" "Mounted: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'."
fi elif [[ "${var_fs_version,,}" == "btrfs" && "${var_encryption_enable}" == "false" ]]; then
declare BTRFS_COMPR_VAR="recipe_${RECIPE_STRING}_${var_transformed_string}_filesystem_btrfs_compress" declare var_btrfs_compression_options="compress=${var_fs_btrfs_compress}:${var_fs_btrfs_level}"
declare BTRFS_LEVEL_VAR="recipe_${RECIPE_STRING}_${var_transformed_string}_filesystem_btrfs_level" mount_with_dir "${var_mount_path}" "/dev/${var_dev}${var_part}" "${var_btrfs_compression_options}"
declare ENCRYPTION_LABEL_VAR="recipe_${RECIPE_STRING}_${var_transformed_string}_encryption_label" [[ -n ${var_mount_subvolume} ]] && create_btrfs_subvolume "${var_mount_path}" "${var_mount_subvolume}"
declare FILESYSTEM_LABEL_VAR="recipe_${RECIPE_STRING}_${var_transformed_string}_filesystem_label" do_log "info" "false" "Mounted: '${var_mount_path}' on: '/dev/${var_dev}${var_part}'."
declare FILESYSTEM_VERSION_VAR="recipe_${RECIPE_STRING}_${var_transformed_string}_filesystem_version"
declare MOUNT_OPTIONS_VAR="recipe_${RECIPE_STRING}_${var_transformed_string}_mount_options"
declare MOUNT_SUBVOLUME_VAR="recipe_${RECIPE_STRING}_${var_transformed_string}_mount_subvolume"
declare BTRFS_COMPR=${!BTRFS_COMPR_VAR} elif [[ "${var_fs_version,,}" == "ext4" && "${var_encryption_enable}" == "true" ]]; then
declare BTRFS_LEVEL=${!BTRFS_LEVEL_VAR}
declare var_encryption_label=${!ENCRYPTION_LABEL_VAR}
declare FILESYSTEM_LABEL=${!FILESYSTEM_LABEL_VAR}
declare FILESYSTEM_VERSION=${!FILESYSTEM_VERSION_VAR}
declare MOUNT_OPTIONS=${!MOUNT_OPTIONS_VAR}
declare MOUNT_SUBVOLUME=${!MOUNT_SUBVOLUME_VAR}
# Skip already mounted paths ("/", "/boot", "/boot/efi") mount_with_dir "${var_mount_path}" "/dev/mapper/${var_encryption_label}"
if [[ ${var_key} == "/" || ${var_key} == "/boot" || ${var_key} == "/boot/efi" ]]; then do_log "info" "false" "Mounted: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'."
continue
fi
if [[ ${FILESYSTEM_VERSION,,} == "btrfs" ]]; then elif [[ "${var_fs_version,,}" == "ext4" && "${var_encryption_enable}" == "false" ]]; then
declare BTRFS_OPTIONS="compress=${BTRFS_COMPR}:${BTRFS_LEVEL}" mount_with_dir "${var_mount_path}" "/dev/${var_dev}${var_part}"
mount_with_dir "${var_key}" "${var_device_path}" "${BTRFS_OPTIONS}" do_log "info" "false" "Mounted: '${var_mount_path}' on: '/dev/${var_dev}${var_part}'."
[[ -n ${MOUNT_SUBVOLUME} ]] && create_btrfs_subvolume "${var_key}" "${MOUNT_SUBVOLUME}"
elif [[ ${FILESYSTEM_VERSION,,} == "ext4" ]]; then
mount_with_dir "${var_key}" "${var_device_path}"
else
do_log "error" "false" "No valid filesystem: '${FILESYSTEM_VERSION}' found for ${var_key}."
fi fi
done done
# Reminder: MAP_EPHEMERALLABEL_DEV["${MOUNT_PATH}"]="/dev/${DEV}${PARTITION}"
# Mounting remaining entries of hashmap 'MAP_EPHEMERALLABEL_DEV'.
declare var_key
declare var_transformed_string
declare var_device_path
for var_key in "${!MAP_EPHEMERAL_DEV[@]}"; do
# Initialize variables
var_device_path="${MAP_EPHEMERAL_DEV[${var_key}]}"
# if KEY:VALUE equals "/dev/${DEV}${PARTITION}"
if [[ ${var_device_path} =~ ^/dev/[a-zA-Z]+[0-9]+$ ]]; then
var_transformed_string=$(echo "${var_device_path}" | sed 's|/dev/|dev_|; s|\([a-zA-Z]\)\([0-9]\)|\1_\2|')
# if KEY:VALUE equals "/dev/mapper/${ENCRYPTION_LABEL}"
elif [[ ${var_device_path} =~ ^/dev/mapper/ ]]; then
# Extract ENCRYPTION_LABEL
var_encryption_label="${var_device_path#/dev/mapper/}"
# Search matching variable of sourced "${PRESEED}" variable file
var_matching_var=$(declare -p | grep -oP "recipe_[^ ]+_encryption_label=${var_encryption_label}")
if [[ -n ${var_matching_var} ]]; then
# Extract third, fourth and fifth part of the respective variable
var_transformed_string=$(echo "${var_matching_var}" | sed -E 's|recipe_[^_]+_(dev_[^_]+_[^_]+)_.*|\1|')
else
do_log "error" "false" "No matching variable found for ENCRYPTION_LABEL='${var_encryption_label}'."
exit "${ERR_NO_ENCR_LABEL}"
fi
else
do_log "error" "false" "Unknown DEVICE_PATH-Format: '${var_device_path}'."
exit "${ERR_NO_DEVIC_PATH}"
fi
declare ENCRYPTION_LABEL_VAR="recipe_${RECIPE_STRING}_${var_transformed_string}_encryption_label"
declare FILESYSTEM_LABEL_VAR="recipe_${RECIPE_STRING}_${var_transformed_string}_filesystem_label"
declare MOUNT_OPTIONS_VAR="recipe_${RECIPE_STRING}_${var_transformed_string}_mount_options"
declare var_encryption_label=${!ENCRYPTION_LABEL_VAR}
declare FILESYSTEM_LABEL=${!FILESYSTEM_LABEL_VAR}
declare MOUNT_OPTIONS=${!MOUNT_OPTIONS_VAR}
if [[ ${var_key} == "SWAP" ]]; then
cryptsetup open --type plain --key-file /dev/random \
--offset 2048 --cipher aes-xts-plain64 --key-size 512 \
--sector-size 4096 "/dev/disk/by-label/${FILESYSTEM_LABEL}" "${var_encryption_label}"
mkswap "/dev/mapper/${var_encryption_label}"
swapon "/dev/mapper/${var_encryption_label}"
do_log "info" "false" "Mounted: '${var_key}' on: '/dev/mapper/${var_encryption_label}'."
elif [[ ${var_key} == "/tmp" ]]; then
cryptsetup open --type plain --key-file /dev/random \
--offset 2048 --cipher aes-xts-plain64 --key-size 512 \
--sector-size 4096 "/dev/disk/by-label/${FILESYSTEM_LABEL}" "${var_encryption_label}"
mkdir -p "${TARGET}/tmp"
mount "${MOUNT_OPTIONS:+-o $MOUNT_OPTIONS}" "/dev/mapper/${var_encryption_label}" "${TARGET}/tmp"
do_log "info" "false" "Mounted: '${var_key}' on: '/dev/mapper/${var_encryption_label}'."
else
do_log "warn" "false" "Ephemeral configuration for ${var_key} is not valid or disabled."
fi
done done
do_log "info" "false" "All devices of 'MAP_MOUNTPATH_DEV' and 'MAP_EPHEMERALLABEL_DEV' successfully mounted."
} }
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh