V8.00.000.2025.06.17

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
2025-06-25 18:32:14 +02:00
parent 157a1d50e1
commit 1cb563a0a0
1 changed files with 27 additions and 65 deletions
--- a/func/3240_partition_formatting.sh
+++ b/func/3240_partition_formatting.sh
@@ -10,81 +10,45 @@
 # SPDX-PackageName: CISS.debian.installer
 # SPDX-Security-Contact: security@coresecret.eu

-###########################################################################################
-# 3.5.2. Functions - installation - partition formatting                                  #
-###########################################################################################

 ###########################################################################################
 # Function to format the respective partition on each device according to the recipe string chosen.
-# Globals:
-#   DIR_LOG
-#   MODULE_ERR
-#   MODULE_TXT
-#   RECIPE_DEV_PARTITIONS
-#   RECIPE_STRING
-# Arguments:
-#   None
-###########################################################################################
-3_5_2_functions_installation_partition_formating() {
-  declare -g -x MODULE_ERR="3_5_2_functions_installation_partition_formating"
-  declare -g -x MODULE_TXT="Formatting each partition on each device according to recipe"
-  do_show_header "${MODULE_TXT}"
+partition_formatting() {
+  ### Iterate over all devices in the recipe.
+  for var_dev in $(yq e ".recipe.${VAR_RECIPE_STRING}.dev | keys | .[]" "${VAR_SETUP_PART}"); do

-  ### Reminder ###
-  # Array: "${!RECIPE_DEV_PARTITIONS[@]}"
-  # ${DEVICE}: ${RECIPE_DEV_PARTITIONS[$DEVICE]}"
+    ### Iterate over all partitions for this device.
+    for var_part in $(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev} | keys | .[]" "${VAR_SETUP_PART}"); do

-  # Declare local variables
-  declare DEV
-  declare NUM_PARTITIONS
-  declare PARTITION
+      ### Extract parameters from YAML.
+      var_encryption_enable=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.enable"         "${VAR_SETUP_PART}")
+      var_encryption_label=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.label"           "${VAR_SETUP_PART}")
+      var_fs_btrfs_checksum=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.checksum" "${VAR_SETUP_PART}")
+      var_fs_btrfs_compress=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.compress" "${VAR_SETUP_PART}")
+      var_fs_btrfs_dedup=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.dedup"       "${VAR_SETUP_PART}")
+      var_fs_format=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.format"                 "${VAR_SETUP_PART}")
+      var_fs_label=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.label"                   "${VAR_SETUP_PART}")
+      var_fs_options=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.options"               "${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}")

-  # Iterate through each device
-  for DEV in "${!RECIPE_DEV_PARTITIONS[@]}"; do
-    NUM_PARTITIONS=${RECIPE_DEV_PARTITIONS[${DEV}]}

-    # Iterate through each partition of the current device
-    for PARTITION in $(seq 1 "${NUM_PARTITIONS}"); do
+      ### Formatting partition
+      if [[ "${var_encryption_enable,,}" == "true" && "${var_mount_path}" != "SWAP" && "${var_mount_path}" != "/tmp" ]]; then

-      # Generate vars for current partition
-      declare ENCRYPTION_ENABLE_VAR="recipe_${RECIPE_STRING}_dev_${DEV}_${PARTITION}_encryption_enable"
-      declare ENCRYPTION_LABEL_VAR="recipe_${RECIPE_STRING}_dev_${DEV}_${PARTITION}_encryption_label"
-      declare FILESYSTEM_BTRFS_CHECKSUM_VAR="recipe_${RECIPE_STRING}_dev_${DEV}_${PARTITION}_filesystem_btrfs_checksum"
-      declare FILESYSTEM_BTRFS_COMPRESS_VAR="recipe_${RECIPE_STRING}_dev_${DEV}_${PARTITION}_filesystem_btrfs_compress"
-      declare FILESYSTEM_BTRFS_DEDUP_VAR="recipe_${RECIPE_STRING}_dev_${DEV}_${PARTITION}_filesystem_btrfs_dedup"
-      declare FILESYSTEM_FORMAT_VAR="recipe_${RECIPE_STRING}_dev_${DEV}_${PARTITION}_filesystem_format"
-      declare FILESYSTEM_LABEL_VAR="recipe_${RECIPE_STRING}_dev_${DEV}_${PARTITION}_filesystem_label"
-      declare FILESYSTEM_OPTIONS_VAR="recipe_${RECIPE_STRING}_dev_${DEV}_${PARTITION}_filesystem_options"
-      declare FILESYSTEM_VERSION_VAR="recipe_${RECIPE_STRING}_dev_${DEV}_${PARTITION}_filesystem_version"
-      declare MOUNT_PATH_VAR="recipe_${RECIPE_STRING}_dev_${DEV}_${PARTITION}_mount_path"
+        if [[ "${var_fs_format,,}" == "true" && "${var_fs_version}" == "btrfs" ]]; then

-      # Initialize variables
-      declare ENCRYPTION_ENABLE=${!ENCRYPTION_ENABLE_VAR}
-      declare ENCRYPTION_LABEL=${!ENCRYPTION_LABEL_VAR}
-      declare BTRFS_CHECKSUM=${!FILESYSTEM_BTRFS_CHECKSUM_VAR}
-      declare BTRFS_COMPRESS=${!FILESYSTEM_BTRFS_COMPRESS_VAR}
-      declare BTRFS_DEDUP=${!FILESYSTEM_BTRFS_DEDUP_VAR}
-      declare FILESYSTEM_FORMAT=${!FILESYSTEM_FORMAT_VAR}
-      declare FILESYSTEM_LABEL=${!FILESYSTEM_LABEL_VAR}
-      declare FILESYSTEM_OPTIONS=${!FILESYSTEM_OPTIONS_VAR}
-      declare FILESYSTEM_VERSION=${!FILESYSTEM_VERSION_VAR}
-      declare MOUNT_PATH=${!MOUNT_PATH_VAR}
+          if [[ "${var_fs_btrfs_dedup,,}" == "true" ]]; then

-      # Formatting partition
-      if [[ ${ENCRYPTION_ENABLE,,} == "true" && ${MOUNT_PATH} != "SWAP" && ${MOUNT_PATH} != "/tmp" ]]; then
+            mkfs.btrfs -L "${var_fs_label}" "/dev/mapper/${var_encryption_label}" -f --csum "${var_fs_btrfs_checksum}" -m dup -O compress="${var_fs_btrfs_compress}"
+            do_log "info" "false" "Partition: '/dev/mapper/${var_encryption_label}' formatted: '${var_fs_version}'."

-        if [[ ${FILESYSTEM_FORMAT,,} == "true" && ${FILESYSTEM_FORMAT} == "btrfs" ]]; then
-
-          if [[ ${BTRFS_DEDUP,,} == "true" ]]; then
-
-            mkfs.btrfs -L "${FILESYSTEM_LABEL}" /dev/mapper/"${ENCRYPTION_LABEL}" -f --csum "${BTRFS_CHECKSUM}" -m dup -O compress="${BTRFS_COMPRESS}"
-            do_log "info" "false" "Partition: '/dev/mapper/${ENCRYPTION_LABEL}' formatted: '${FILESYSTEM_VERSION}'."
            # shellcheck disable=SC2129
-            echo "Partition: '/dev/mapper/${ENCRYPTION_LABEL}':" >> "${DIR_LOG}"btrfs.log
-            btrfs filesystem show /dev/mapper/"${ENCRYPTION_LABEL}" >> "${DIR_LOG}"btrfs.log
-            echo "" >> "${DIR_LOG}"btrfs.log
+            echo "Partition: '/dev/mapper/${var_encryption_label}':" >> "${DIR_LOG}/btrfs.log"
+            btrfs filesystem show "/dev/mapper/${var_encryption_label}" >> "${DIR_LOG}/btrfs.log"
+            echo "" >> "${DIR_LOG}/btrfs.log"

-          elif [[ ${BTRFS_DEDUP,,} == "false" ]]; then
+          elif [[ "${var_fs_btrfs_dedup,,}" == "false" ]]; then

            mkfs.btrfs -L "${FILESYSTEM_LABEL}" /dev/mapper/"${ENCRYPTION_LABEL}" -f --csum "${BTRFS_CHECKSUM}" -O compress="${BTRFS_COMPRESS}"
            do_log "info" "false" "Partition: '/dev/mapper/${ENCRYPTION_LABEL}' formatted: '${FILESYSTEM_VERSION}'."
@@ -167,7 +131,5 @@
    done

  done
-
-  do_show_footer
 }
-# 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